Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/c94d05177c52fd510dff17269c84caadce626bd9
...commit
http://git.netsurf-browser.org/toolchains.git/commit/c94d05177c52fd510dff17269c84caadce626bd9
...tree
http://git.netsurf-browser.org/toolchains.git/tree/c94d05177c52fd510dff17269c84caadce626bd9
The branch, chris/gcc6-os3 has been updated
via c94d05177c52fd510dff17269c84caadce626bd9 (commit)
via 69e959540abcdd8c972d0ed68e1ba5cd0abf73e6 (commit)
via aa2ab120411cb6db9f19af7469576239a4e98a9c (commit)
via 9754ee0f2a14dbcbb5fe9eac33519a0afd516163 (commit)
via 64f3c0b0b1f62a19080d88117b4981c775218e14 (commit)
via e31690436647c2c2b32cc154127015fb6034607a (commit)
from 7b6bafd386a75887df7d5bcacc5b2cc3f0147bc6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=c94d05177c52fd510dff17269c84caadce626bd9
commit c94d05177c52fd510dff17269c84caadce626bd9
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Revert "Try to fix some paths"
This reverts commit 69e959540abcdd8c972d0ed68e1ba5cd0abf73e6.
diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
index 6664a04..a727fd3 100644
--- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
+++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
@@ -5861,7 +5861,7 @@ index bf3f32da08ac..7aa190620911 100644
;;
+m68k*-*-amigaosvasm*)
+ default_m68k_cpu=68000
-+ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/amigaos.h"
++ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/m68kamigaos.h"
+ tm_defines="${tm_defines} MOTOROLA=1 TARGET_AMIGAOS TARGET_AMIGAOS_VASM
TARGET_CPU_DEFAULT=0"
+ tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-amigaos"
+ tm_p_file="${tm_p_file} m68k/amigaos-protos.h"
@@ -5871,7 +5871,7 @@ index bf3f32da08ac..7aa190620911 100644
+ ;;
+m68k*-*-amigaos*)
+ default_m68k_cpu=68000
-+ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/amigaos.h"
++ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/m68kamigaos.h"
+ tm_defines="${tm_defines} MOTOROLA=1 TARGET_AMIGAOS
TARGET_CPU_DEFAULT=0"
+ tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-amigaos"
+ tm_p_file="${tm_p_file} m68k/amigaos-protos.h"
@@ -8687,7 +8687,7 @@ index 000000000000..3f3aafc5f254
+ "-isystem %:sdk_root(libnix/include) " \
+ "%{!ansi:-Dlibnix} -D__libnix__ -D__libnix"
+#define CPP_CLIB2_SPEC \
-+ "-isystem %:sdk_root(include) " \
++ "-isystem %:sdk_root(clib2/include) " \
+ "%{!ansi:-DCLIB2} -D__CLIB2__ -D__CLIB2"
+
+/* Define __HAVE_68881__ in preprocessor according to the -m flags.
@@ -8774,7 +8774,7 @@ index 000000000000..3f3aafc5f254
+ ")"
+
+#define STARTFILE_CLIB2_SPEC \
-+ "%:sdk_root(lib/ " \
++ "%:sdk_root(clib2/lib/ " \
+ "%{resident32:nr32crt0.o%s}" \
+ "%{!resident32:" \
+ "%{fbaserel32:nb32crt0.o%s}" \
@@ -8871,7 +8871,7 @@ index 000000000000..3f3aafc5f254
+
+#define LINK_IXEMUL_SPEC ""
+#define LINK_LIBNIX_SPEC "-L%:sdk_root(libnix/lib) -fl libnix"
-+#define LINK_CLIB2_SPEC "-L%:sdk_root(lib)"
++#define LINK_CLIB2_SPEC "-L%:sdk_root(clib2/lib)"
+
+/* If debugging, tell the linker to output amiga-hunk symbols *and* a BSD
+ compatible debug hunk.
@@ -9833,7 +9833,7 @@ index 85ea19bd3a09..a4da7d515ce5 100644
+#ifdef TARGET_AMIGA
+const char * amiga_m68k_prefix_func(int argc, const char ** argv) {
+ char * p = 0;
-+ /* if (standard_libexec_prefix)
++ if (standard_libexec_prefix)
+ {
+ char * glp = concat(standard_libexec_prefix, "", NULL);
+ p = strrchr(glp, '/');
@@ -9848,12 +9848,12 @@ index 85ea19bd3a09..a4da7d515ce5 100644
+ if (p)
+ {
+ p[1] = 0;
-+ p = concat(glp, "m68k-unknown-amigaos/", NULL);
++ p = concat(glp, "m68k-amigaos/", NULL);
+ }
+ }
+ }
+ free(glp);
-+ }*/
++ }
+ if (!p)
+ p = concat("../../../../", "", NULL);
+
@@ -9862,7 +9862,7 @@ index 85ea19bd3a09..a4da7d515ce5 100644
+ free(p);
+ p = q;
+ }
-+ //*p = 0;
++// printf("amiga_m68k_prefix_func='%s'\n", p);
+ return p;
+}
+#endif
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=69e959540abcdd8c972d0ed68e1ba5cd0abf73e6
commit 69e959540abcdd8c972d0ed68e1ba5cd0abf73e6
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Try to fix some paths
Revert back to the old amigaos.h file
diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
index a727fd3..6664a04 100644
--- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
+++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
@@ -5861,7 +5861,7 @@ index bf3f32da08ac..7aa190620911 100644
;;
+m68k*-*-amigaosvasm*)
+ default_m68k_cpu=68000
-+ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/m68kamigaos.h"
++ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/amigaos.h"
+ tm_defines="${tm_defines} MOTOROLA=1 TARGET_AMIGAOS TARGET_AMIGAOS_VASM
TARGET_CPU_DEFAULT=0"
+ tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-amigaos"
+ tm_p_file="${tm_p_file} m68k/amigaos-protos.h"
@@ -5871,7 +5871,7 @@ index bf3f32da08ac..7aa190620911 100644
+ ;;
+m68k*-*-amigaos*)
+ default_m68k_cpu=68000
-+ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/m68kamigaos.h"
++ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/amigaos.h"
+ tm_defines="${tm_defines} MOTOROLA=1 TARGET_AMIGAOS
TARGET_CPU_DEFAULT=0"
+ tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-amigaos"
+ tm_p_file="${tm_p_file} m68k/amigaos-protos.h"
@@ -8687,7 +8687,7 @@ index 000000000000..3f3aafc5f254
+ "-isystem %:sdk_root(libnix/include) " \
+ "%{!ansi:-Dlibnix} -D__libnix__ -D__libnix"
+#define CPP_CLIB2_SPEC \
-+ "-isystem %:sdk_root(clib2/include) " \
++ "-isystem %:sdk_root(include) " \
+ "%{!ansi:-DCLIB2} -D__CLIB2__ -D__CLIB2"
+
+/* Define __HAVE_68881__ in preprocessor according to the -m flags.
@@ -8774,7 +8774,7 @@ index 000000000000..3f3aafc5f254
+ ")"
+
+#define STARTFILE_CLIB2_SPEC \
-+ "%:sdk_root(clib2/lib/ " \
++ "%:sdk_root(lib/ " \
+ "%{resident32:nr32crt0.o%s}" \
+ "%{!resident32:" \
+ "%{fbaserel32:nb32crt0.o%s}" \
@@ -8871,7 +8871,7 @@ index 000000000000..3f3aafc5f254
+
+#define LINK_IXEMUL_SPEC ""
+#define LINK_LIBNIX_SPEC "-L%:sdk_root(libnix/lib) -fl libnix"
-+#define LINK_CLIB2_SPEC "-L%:sdk_root(clib2/lib)"
++#define LINK_CLIB2_SPEC "-L%:sdk_root(lib)"
+
+/* If debugging, tell the linker to output amiga-hunk symbols *and* a BSD
+ compatible debug hunk.
@@ -9833,7 +9833,7 @@ index 85ea19bd3a09..a4da7d515ce5 100644
+#ifdef TARGET_AMIGA
+const char * amiga_m68k_prefix_func(int argc, const char ** argv) {
+ char * p = 0;
-+ if (standard_libexec_prefix)
++ /* if (standard_libexec_prefix)
+ {
+ char * glp = concat(standard_libexec_prefix, "", NULL);
+ p = strrchr(glp, '/');
@@ -9848,12 +9848,12 @@ index 85ea19bd3a09..a4da7d515ce5 100644
+ if (p)
+ {
+ p[1] = 0;
-+ p = concat(glp, "m68k-amigaos/", NULL);
++ p = concat(glp, "m68k-unknown-amigaos/", NULL);
+ }
+ }
+ }
+ free(glp);
-+ }
++ }*/
+ if (!p)
+ p = concat("../../../../", "", NULL);
+
@@ -9862,7 +9862,7 @@ index 85ea19bd3a09..a4da7d515ce5 100644
+ free(p);
+ p = q;
+ }
-+// printf("amiga_m68k_prefix_func='%s'\n", p);
++ //*p = 0;
+ return p;
+}
+#endif
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=aa2ab120411cb6db9f19af7469576239a4e98a9c
commit aa2ab120411cb6db9f19af7469576239a4e98a9c
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Revert removal of path code
diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
index 86e283b..a727fd3 100644
--- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
+++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
@@ -8848,7 +8848,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(lib_libnix)} " \
+ "%{mcrt=ixemul:%(lib_ixemul)} " \
+ "%{mcrt=clib2:%(lib_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(lib_libnix)}}"
++ "%{!noixemul:%{!mcrt*:%(lib_clib2)}}"
+#endif
+
+#define LIBGCC_IXEMUL_SPEC ""
@@ -8975,10 +8975,10 @@ index 000000000000..3f3aafc5f254
+ "%{T*} }}}}}} "
+#endif
+
-+/*extern const char * amiga_m68k_prefix_func(int, const char **);*/
++extern const char * amiga_m68k_prefix_func(int, const char **);
+
-+/*#define EXTRA_SPEC_FUNCTIONS \
-+ { "sdk_root", amiga_m68k_prefix_func },*/
++#define EXTRA_SPEC_FUNCTIONS \
++ { "sdk_root", amiga_m68k_prefix_func },
+
+/* This macro defines names of additional specifications to put in the specs
+ that can be used in various specifications like CC1_SPEC. Its definition
@@ -9821,6 +9821,51 @@ index 6942a504127f..ebe3e1c37121 100644
#include "stringpool.h"
#include "expmed.h"
#include "optabs.h"
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 85ea19bd3a09..a4da7d515ce5 100644
+--- gcc/gcc.c
++++ gcc/gcc.c
+@@ -10107,3 +10107,40 @@ driver_get_configure_time_options (void (*cb) (const
char *option,
+ obstack_free (&obstack, NULL);
+ n_switches = 0;
+ }
++
++#ifdef TARGET_AMIGA
++const char * amiga_m68k_prefix_func(int argc, const char ** argv) {
++ char * p = 0;
++ if (standard_libexec_prefix)
++ {
++ char * glp = concat(standard_libexec_prefix, "", NULL);
++ p = strrchr(glp, '/');
++ if (p)
++ {
++ *p = 0;
++ p = strrchr(glp, '/');
++ if (p)
++ {
++ *p = 0;
++ p = strrchr(glp, '/');
++ if (p)
++ {
++ p[1] = 0;
++ p = concat(glp, "m68k-amigaos/", NULL);
++ }
++ }
++ }
++ free(glp);
++ }
++ if (!p)
++ p = concat("../../../../", "", NULL);
++
++ for (int i = 0; i < argc; ++i) {
++ char * q = concat(p, argv[i], NULL);
++ free(p);
++ p = q;
++ }
++// printf("amiga_m68k_prefix_func='%s'\n", p);
++ return p;
++}
++#endif
diff --git a/gcc/gcse.c b/gcc/gcse.c
index 5b2c96ecb5a6..f74e733f9337 100644
--- gcc/gcse.c
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=9754ee0f2a14dbcbb5fe9eac33519a0afd516163
commit 9754ee0f2a14dbcbb5fe9eac33519a0afd516163
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Remove EXTRA_SPECS_FUNCTIONS
diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
index 956c635..86e283b 100644
--- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
+++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
@@ -8975,10 +8975,10 @@ index 000000000000..3f3aafc5f254
+ "%{T*} }}}}}} "
+#endif
+
-+extern const char * amiga_m68k_prefix_func(int, const char **);
++/*extern const char * amiga_m68k_prefix_func(int, const char **);*/
+
-+#define EXTRA_SPEC_FUNCTIONS \
-+ { "sdk_root", amiga_m68k_prefix_func },
++/*#define EXTRA_SPEC_FUNCTIONS \
++ { "sdk_root", amiga_m68k_prefix_func },*/
+
+/* This macro defines names of additional specifications to put in the specs
+ that can be used in various specifications like CC1_SPEC. Its definition
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=64f3c0b0b1f62a19080d88117b4981c775218e14
commit 64f3c0b0b1f62a19080d88117b4981c775218e14
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Attempt to default to clib2
diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
index bac72b5..956c635 100644
--- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
+++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
@@ -8717,7 +8717,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(cpp_libnix)} " \
+ "%{mcrt=ixemul:%(cpp_ixemul)} " \
+ "%{mcrt=clib2:%(cpp_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(cpp_libnix)}}"
++ "%{!noixemul:%{!mcrt*:%(cpp_clib2)}}"
+
+/* Various -m flags require special flags to the assembler. */
+
@@ -8795,7 +8795,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(startfile_libnix)} " \
+ "%{mcrt=ixemul:%(startfile_ixemul)} " \
+ "%{mcrt=clib2:%(startfile_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(startfile_libnix)}}"
++ "%{!noixemul:%{!mcrt*:%(startfile_clib2)}}"
+#endif
+
+#define ENDFILE_IXEMUL_SPEC ""
@@ -8808,7 +8808,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(endfile_libnix)} " \
+ "%{mcrt=ixemul:%(endfile_ixemul)} " \
+ "%{mcrt=clib2:%(endfile_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(endfile_libnix)}}"
++ "%{!noixemul:%{!mcrt*:%(endfile_clib2)}}"
+
+
+/* Automatically search libamiga.a for AmigaOS specific functions. Note
@@ -8861,7 +8861,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(libgcc_libnix)} " \
+ "%{mcrt=ixemul:%(libgcc_ixemul)} " \
+ "%{mcrt=clib2:%(libgcc_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(libgcc_libnix)}}"
++ "%{!noixemul:%{!mcrt*:%(libgcc_clib2)}}"
+
+
+/* If debugging, tell the linker to output amiga-hunk symbols *and* a BSD
@@ -8884,7 +8884,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(link_libnix)} " \
+ "%{mcrt=ixemul:%(link_ixemul)} " \
+ "%{mcrt=clib2:%(link_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(link_libnix)}} " \
++ "%{!noixemul:%{!mcrt*:%(link_clib2)}} " \
+ "%{fbaserel:%{!resident:-m amiga_bss -fl libb %{noixemul:-fl libnix}
%{mcrt=nix*:-fl libnix}}} " \
+ "%{resident:-m amiga_bss -amiga-datadata-reloc -fl libb %{noixemul:-fl
libnix} %{mcrt=nix*:-fl libnix}} " \
+ "%{fbaserel32:%{!resident32:-m amiga_bss -fl libb32 %{noixemul:-fl libnix}
%{mcrt=nix*:-fl libnix}}} " \
@@ -8904,7 +8904,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(link_libnix)} " \
+ "%{mcrt=ixemul:%(link_ixemul)} " \
+ "%{mcrt=clib2:%(link_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(link_libnix)}} " \
++ "%{!noixemul:%{!mcrt*:%(link_clib2)}} " \
+ "%{fbaserel:%{!resident:-m amiga_bss -fl libb %{noixemul:-fl libnix}
%{mcrt=nix*:-fl libnix}}} " \
+ "%{resident:-m amiga_bss -amiga-datadata-reloc -fl libb %{noixemul:-fl
libnix} %{mcrt=nix*:-fl libnix}} " \
+ "%{fbaserel32:%{!resident32:-m amiga_bss -fl libb32 %{noixemul:-fl libnix}
%{mcrt=nix*:-fl libnix}}} " \
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=e31690436647c2c2b32cc154127015fb6034607a
commit e31690436647c2c2b32cc154127015fb6034607a
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Update libs to same as we are using for ppc-amigaos toolchain
Remove a patch that was giving us incorrect paths
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 89b9139..8a54b86 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -12,18 +12,18 @@ UPSTREAM_BINUTILS_VERSION := 2.14
UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION)
UPSTREAM_BINUTILS_URI :=
http://svn.code.sf.net/p/adtools/code/branches/binutils/$(UPSTREAM_BINUTILS_VERSION)/
-UPSTREAM_GMP_VERSION := 4.3.2
+UPSTREAM_GMP_VERSION := 6.1.2
UPSTREAM_GMP_TARBALL := gmp-$(UPSTREAM_GMP_VERSION).tar.bz2
UPSTREAM_GMP_URI := http://ftp.gnu.org/gnu/gmp/$(UPSTREAM_GMP_TARBALL)
# Would use 3.0.0, but that dislikes in-tree gmp sources
-UPSTREAM_MPFR_VERSION := 2.4.2
+UPSTREAM_MPFR_VERSION := 3.1.6
UPSTREAM_MPFR_TARBALL := mpfr-$(UPSTREAM_MPFR_VERSION).tar.bz2
UPSTREAM_MPFR_URI :=
http://www.mpfr.org/mpfr-$(UPSTREAM_MPFR_VERSION)/$(UPSTREAM_MPFR_TARBALL)
-UPSTREAM_MPC_VERSION := 0.8.2
+UPSTREAM_MPC_VERSION := 1.0.2
UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz
-UPSTREAM_MPC_URI :=
http://www.multiprecision.org/downloads/$(UPSTREAM_MPC_TARBALL)
+UPSTREAM_MPC_URI := http://ftp.gnu.org/gnu/mpc/$(UPSTREAM_MPC_TARBALL)
UPSTREAM_CLIB2_VERSION := 1_214
UPSTREAM_CLIB2_TARBALL := V$(UPSTREAM_CLIB2_VERSION).tar.gz
diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
index 8b4d30c..bac72b5 100644
--- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
+++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
@@ -9821,51 +9821,6 @@ index 6942a504127f..ebe3e1c37121 100644
#include "stringpool.h"
#include "expmed.h"
#include "optabs.h"
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 85ea19bd3a09..a4da7d515ce5 100644
---- gcc/gcc.c
-+++ gcc/gcc.c
-@@ -10107,3 +10107,40 @@ driver_get_configure_time_options (void (*cb) (const
char *option,
- obstack_free (&obstack, NULL);
- n_switches = 0;
- }
-+
-+#ifdef TARGET_AMIGA
-+const char * amiga_m68k_prefix_func(int argc, const char ** argv) {
-+ char * p = 0;
-+ if (standard_libexec_prefix)
-+ {
-+ char * glp = concat(standard_libexec_prefix, "", NULL);
-+ p = strrchr(glp, '/');
-+ if (p)
-+ {
-+ *p = 0;
-+ p = strrchr(glp, '/');
-+ if (p)
-+ {
-+ *p = 0;
-+ p = strrchr(glp, '/');
-+ if (p)
-+ {
-+ p[1] = 0;
-+ p = concat(glp, "m68k-amigaos/", NULL);
-+ }
-+ }
-+ }
-+ free(glp);
-+ }
-+ if (!p)
-+ p = concat("../../../../", "", NULL);
-+
-+ for (int i = 0; i < argc; ++i) {
-+ char * q = concat(p, argv[i], NULL);
-+ free(p);
-+ p = q;
-+ }
-+// printf("amiga_m68k_prefix_func='%s'\n", p);
-+ return p;
-+}
-+#endif
diff --git a/gcc/gcse.c b/gcc/gcse.c
index 5b2c96ecb5a6..f74e733f9337 100644
--- gcc/gcse.c
-----------------------------------------------------------------------
Summary of changes:
m68k-unknown-amigaos/Makefile | 8 ++++----
m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p | 14 +++++++-------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 89b9139..8a54b86 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -12,18 +12,18 @@ UPSTREAM_BINUTILS_VERSION := 2.14
UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION)
UPSTREAM_BINUTILS_URI :=
http://svn.code.sf.net/p/adtools/code/branches/binutils/$(UPSTREAM_BINUTILS_VERSION)/
-UPSTREAM_GMP_VERSION := 4.3.2
+UPSTREAM_GMP_VERSION := 6.1.2
UPSTREAM_GMP_TARBALL := gmp-$(UPSTREAM_GMP_VERSION).tar.bz2
UPSTREAM_GMP_URI := http://ftp.gnu.org/gnu/gmp/$(UPSTREAM_GMP_TARBALL)
# Would use 3.0.0, but that dislikes in-tree gmp sources
-UPSTREAM_MPFR_VERSION := 2.4.2
+UPSTREAM_MPFR_VERSION := 3.1.6
UPSTREAM_MPFR_TARBALL := mpfr-$(UPSTREAM_MPFR_VERSION).tar.bz2
UPSTREAM_MPFR_URI :=
http://www.mpfr.org/mpfr-$(UPSTREAM_MPFR_VERSION)/$(UPSTREAM_MPFR_TARBALL)
-UPSTREAM_MPC_VERSION := 0.8.2
+UPSTREAM_MPC_VERSION := 1.0.2
UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz
-UPSTREAM_MPC_URI :=
http://www.multiprecision.org/downloads/$(UPSTREAM_MPC_TARBALL)
+UPSTREAM_MPC_URI := http://ftp.gnu.org/gnu/mpc/$(UPSTREAM_MPC_TARBALL)
UPSTREAM_CLIB2_VERSION := 1_214
UPSTREAM_CLIB2_TARBALL := V$(UPSTREAM_CLIB2_VERSION).tar.gz
diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
index 8b4d30c..a727fd3 100644
--- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
+++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
@@ -8717,7 +8717,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(cpp_libnix)} " \
+ "%{mcrt=ixemul:%(cpp_ixemul)} " \
+ "%{mcrt=clib2:%(cpp_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(cpp_libnix)}}"
++ "%{!noixemul:%{!mcrt*:%(cpp_clib2)}}"
+
+/* Various -m flags require special flags to the assembler. */
+
@@ -8795,7 +8795,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(startfile_libnix)} " \
+ "%{mcrt=ixemul:%(startfile_ixemul)} " \
+ "%{mcrt=clib2:%(startfile_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(startfile_libnix)}}"
++ "%{!noixemul:%{!mcrt*:%(startfile_clib2)}}"
+#endif
+
+#define ENDFILE_IXEMUL_SPEC ""
@@ -8808,7 +8808,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(endfile_libnix)} " \
+ "%{mcrt=ixemul:%(endfile_ixemul)} " \
+ "%{mcrt=clib2:%(endfile_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(endfile_libnix)}}"
++ "%{!noixemul:%{!mcrt*:%(endfile_clib2)}}"
+
+
+/* Automatically search libamiga.a for AmigaOS specific functions. Note
@@ -8848,7 +8848,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(lib_libnix)} " \
+ "%{mcrt=ixemul:%(lib_ixemul)} " \
+ "%{mcrt=clib2:%(lib_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(lib_libnix)}}"
++ "%{!noixemul:%{!mcrt*:%(lib_clib2)}}"
+#endif
+
+#define LIBGCC_IXEMUL_SPEC ""
@@ -8861,7 +8861,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(libgcc_libnix)} " \
+ "%{mcrt=ixemul:%(libgcc_ixemul)} " \
+ "%{mcrt=clib2:%(libgcc_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(libgcc_libnix)}}"
++ "%{!noixemul:%{!mcrt*:%(libgcc_clib2)}}"
+
+
+/* If debugging, tell the linker to output amiga-hunk symbols *and* a BSD
@@ -8884,7 +8884,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(link_libnix)} " \
+ "%{mcrt=ixemul:%(link_ixemul)} " \
+ "%{mcrt=clib2:%(link_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(link_libnix)}} " \
++ "%{!noixemul:%{!mcrt*:%(link_clib2)}} " \
+ "%{fbaserel:%{!resident:-m amiga_bss -fl libb %{noixemul:-fl libnix}
%{mcrt=nix*:-fl libnix}}} " \
+ "%{resident:-m amiga_bss -amiga-datadata-reloc -fl libb %{noixemul:-fl
libnix} %{mcrt=nix*:-fl libnix}} " \
+ "%{fbaserel32:%{!resident32:-m amiga_bss -fl libb32 %{noixemul:-fl libnix}
%{mcrt=nix*:-fl libnix}}} " \
@@ -8904,7 +8904,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(link_libnix)} " \
+ "%{mcrt=ixemul:%(link_ixemul)} " \
+ "%{mcrt=clib2:%(link_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(link_libnix)}} " \
++ "%{!noixemul:%{!mcrt*:%(link_clib2)}} " \
+ "%{fbaserel:%{!resident:-m amiga_bss -fl libb %{noixemul:-fl libnix}
%{mcrt=nix*:-fl libnix}}} " \
+ "%{resident:-m amiga_bss -amiga-datadata-reloc -fl libb %{noixemul:-fl
libnix} %{mcrt=nix*:-fl libnix}} " \
+ "%{fbaserel32:%{!resident32:-m amiga_bss -fl libb32 %{noixemul:-fl libnix}
%{mcrt=nix*:-fl libnix}}} " \
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
