summaryrefslogtreecommitdiff
path: root/cross/nios2-gcc41/patches
diff options
context:
space:
mode:
Diffstat (limited to 'cross/nios2-gcc41/patches')
-rw-r--r--cross/nios2-gcc41/patches/patch-aa52
-rw-r--r--cross/nios2-gcc41/patches/patch-gcc_config_nios2_nios2-proto.h22
-rw-r--r--cross/nios2-gcc41/patches/patch-gcc_config_nios2_nios2.c28
-rw-r--r--cross/nios2-gcc41/patches/patch-gcc_doc_invoke.texi15
-rw-r--r--cross/nios2-gcc41/patches/patch-libjava_classpath_script_loc24
5 files changed, 141 insertions, 0 deletions
diff --git a/cross/nios2-gcc41/patches/patch-aa b/cross/nios2-gcc41/patches/patch-aa
new file mode 100644
index 00000000000..11187891148
--- /dev/null
+++ b/cross/nios2-gcc41/patches/patch-aa
@@ -0,0 +1,52 @@
+$NetBSD: patch-aa,v 1.1 2013/11/16 07:41:00 mef Exp $
+#
+# (1) craft FPBIT_FUNCS and DPBIT_FUNCS lists to avoid routine collision
+# against NetBSD softfloat implementation. Following twelve are to
+# be eliminated;
+# _addsub_df.o _addsub_sf.o _df_to_sf.o _df_to_si.o
+# _div_df.o _div_sf.o _mul_df.o _mul_sf.o _sf_to_df.o _sf_to_si.o
+# _si_to_df.o _si_to_sf.o
+# (2) To swith with and without documents, put @@VAR@@ type words.
+
+--- gcc/Makefile.in.orig 2013-06-14 06:32:52.000000000 +0900
++++ gcc/Makefile.in 2013-10-22 18:50:44.000000000 +0900
+@@ -1062,15 +1062,15 @@ LIBGCOV = _gcov _gcov_merge_add _gcov_me
+ _gcov_execv _gcov_execvp _gcov_execve \
+ _gcov_interval_profiler _gcov_pow2_profiler _gcov_one_value_profiler
+
+-FPBIT_FUNCS = _pack_sf _unpack_sf _addsub_sf _mul_sf _div_sf \
++FPBIT_FUNCS = _pack_sf _unpack_sf \
+ _fpcmp_parts_sf _compare_sf _eq_sf _ne_sf _gt_sf _ge_sf \
+- _lt_sf _le_sf _unord_sf _si_to_sf _sf_to_si _negate_sf _make_sf \
+- _sf_to_df _sf_to_tf _thenan_sf _sf_to_usi _usi_to_sf
++ _lt_sf _le_sf _unord_sf _negate_sf _make_sf \
++ _sf_to_tf _thenan_sf _sf_to_usi _usi_to_sf
+
+-DPBIT_FUNCS = _pack_df _unpack_df _addsub_df _mul_df _div_df \
++DPBIT_FUNCS = _pack_df _unpack_df \
+ _fpcmp_parts_df _compare_df _eq_df _ne_df _gt_df _ge_df \
+- _lt_df _le_df _unord_df _si_to_df _df_to_si _negate_df _make_df \
+- _df_to_sf _df_to_tf _thenan_df _df_to_usi _usi_to_df
++ _lt_df _le_df _unord_df _negate_df _make_df \
++ _df_to_tf _thenan_df _df_to_usi _usi_to_df
+
+ TPBIT_FUNCS = _pack_tf _unpack_tf _addsub_tf _mul_tf _div_tf \
+ _fpcmp_parts_tf _compare_tf _eq_tf _ne_tf _gt_tf _ge_tf \
+@@ -1216,7 +1216,7 @@
+ all.internal: start.encap rest.encap doc
+ # This is what to compile if making a cross-compiler.
+ all.cross: native gcc-cross cpp$(exeext) specs \
+- $(LIBGCC) $(EXTRA_PARTS) lang.all.cross doc @GENINSRC@ srcextra
++ $(LIBGCC) $(EXTRA_PARTS) lang.all.cross @@DOC@@ @GENINSRC@ srcextra
+ # This is what must be made before installing GCC and converting libraries.
+ start.encap: native xgcc$(exeext) cpp$(exeext) specs \
+ lang.start.encap @GENINSRC@ srcextra
+@@ -3655,7 +3655,7 @@
+ # Install the driver last so that the window when things are
+ # broken is small.
+ install: install-common $(INSTALL_HEADERS) $(INSTALL_LIBGCC) \
+- install-cpp install-man install-info install-html install-pdf \
++ install-cpp install-man install-info @@INSTALL_HTML@@ @@INSTALL_PDF@@ \
+ install-@POSUB@ lang.install-normal install-driver
+
+ # Handle cpp installation.
diff --git a/cross/nios2-gcc41/patches/patch-gcc_config_nios2_nios2-proto.h b/cross/nios2-gcc41/patches/patch-gcc_config_nios2_nios2-proto.h
new file mode 100644
index 00000000000..c9e7c4196d0
--- /dev/null
+++ b/cross/nios2-gcc41/patches/patch-gcc_config_nios2_nios2-proto.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-gcc_config_nios2_nios2-proto.h,v 1.1 2013/11/16 07:41:00 mef Exp $
+
+Correction of prototype declaration.
+This was origin of segmentation fault at compiling crtstuff.c
+on 64bit machine, thanks nisimura@
+
+diff --git a/gcc-4.1/gcc/config/nios2/nios2-protos.h b/gcc-4.1/gcc/config/nios2/nios2-protos.h
+index 7f72eaa..2b7db5d 100644
+--- a/gcc-4.1/gcc/config/nios2/nios2-protos.h
++++ gcc/config/nios2/nios2-protos.h
+@@ -35,8 +35,10 @@ extern enum reg_class reg_class_from_constraint (char, const char *);
+ extern void nios2_register_target_pragmas (void);
+
+ #ifdef RTX_CODE
+-extern int nios2_legitimate_address (rtx, enum machine_mode, int);
++extern bool nios2_legitimate_pic_operand_p (rtx x);
++extern bool nios2_legitimate_address (rtx, enum machine_mode, int);
+ extern int nios2_legitimate_constant (rtx);
++extern rtx nios2_legitimize_address (rtx, rtx, enum machine_mode);
+ extern void nios2_print_operand (FILE *, rtx, int);
+ extern void nios2_print_operand_address (FILE *, rtx);
+
diff --git a/cross/nios2-gcc41/patches/patch-gcc_config_nios2_nios2.c b/cross/nios2-gcc41/patches/patch-gcc_config_nios2_nios2.c
new file mode 100644
index 00000000000..3253a261901
--- /dev/null
+++ b/cross/nios2-gcc41/patches/patch-gcc_config_nios2_nios2.c
@@ -0,0 +1,28 @@
+$NetBSD: patch-gcc_config_nios2_nios2.c,v 1.1 2013/11/16 07:41:00 mef Exp $
+
+Move prototype to nios2-proto.h, thanks nisimura@
+
+diff --git a/gcc-4.1/gcc/config/nios2/nios2.c b/gcc-4.1/gcc/config/nios2/nios2.c
+index f8cdb9d..fafa968 100644
+--- a/gcc-4.1/gcc/config/nios2/nios2.c
++++ gcc/config/nios2/nios2.c
+@@ -84,10 +84,8 @@ static tree nios2_handle_struct_attribute (tree *, tree, tree, int, bool *);
+ static void nios2_insert_attributes (tree, tree *);
+ static void nios2_load_pic_register (void);
+ static bool nios2_cannot_force_const_mem (rtx);
+-bool nios2_legitimate_pic_operand_p (rtx x);
+ static rtx nios2_legitimize_pic_address (rtx orig, enum machine_mode mode,
+ rtx reg);
+-rtx nios2_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode);
+ static void nios2_init_builtins (void);
+ static rtx nios2_expand_builtin (tree, rtx, rtx, enum machine_mode, int);
+ static bool nios2_function_ok_for_sibcall (tree, tree);
+@@ -2361,7 +2359,7 @@ nios2_legitimate_constant (rtx x)
+ }
+ }
+
+-int
++bool
+ nios2_legitimate_address (rtx operand, enum machine_mode mode ATTRIBUTE_UNUSED,
+ int strict)
+ {
diff --git a/cross/nios2-gcc41/patches/patch-gcc_doc_invoke.texi b/cross/nios2-gcc41/patches/patch-gcc_doc_invoke.texi
new file mode 100644
index 00000000000..b75a2760a68
--- /dev/null
+++ b/cross/nios2-gcc41/patches/patch-gcc_doc_invoke.texi
@@ -0,0 +1,15 @@
+$NetBSD: patch-gcc_doc_invoke.texi,v 1.1 2013/11/16 07:41:00 mef Exp $
+
+wip/nios2-gcc/work/gcc-4.1/gcc/doc/invoke.texi:1078: I can't find file `'.
+
+--- gcc/doc/invoke.texi.orig 2013-06-14 06:32:55.000000000 +0900
++++ gcc/doc/invoke.texi 2013-11-09 10:31:35.000000000 +0900
+@@ -1075,7 +1075,7 @@
+ @opindex version
+ Display the version number and copyrights of the invoked GCC@.
+
+-@include @value{srcdir}/../libiberty/at-file.texi
++@c @include @value{srcdir}/../libiberty/at-file.texi
+ @end table
+
+ @node Invoking G++
diff --git a/cross/nios2-gcc41/patches/patch-libjava_classpath_script_loc b/cross/nios2-gcc41/patches/patch-libjava_classpath_script_loc
new file mode 100644
index 00000000000..28a7cc9027f
--- /dev/null
+++ b/cross/nios2-gcc41/patches/patch-libjava_classpath_script_loc
@@ -0,0 +1,24 @@
+$NetBSD: patch-libjava_classpath_script_loc,v 1.1 2013/11/16 07:41:00 mef Exp $
+
+portablily check
+
+--- libjava/classpath/scripts/loc.orig 2013-06-14 06:33:15.000000000 +0900
++++ libjava/classpath/scripts/loc 2013-11-08 09:55:51.000000000 +0900
+@@ -19,7 +19,7 @@
+
+
+ MODE=$1
+-if test "$MODE" == "-l"; then
++if test "$MODE" = "-l"; then
+ COMMAND='(locate \*.jar ; locate \*.war)'
+ shift
+ else
+@@ -27,7 +27,7 @@
+ fi
+
+ FOO=$2
+-if test "x$FOO" == "x"; then
++if test "x$FOO" = "x"; then
+ FOO=/usr/share/java
+ fi
+