diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2018-01-20 22:18:00 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2018-07-23 18:41:06 +0100 |
| commit | 7047874498641f6199233272bc4b81927a8b152a (patch) | |
| tree | 7a4935ef9c294c48653c672a318590809f65b5db | |
| parent | 333382b5c85fae6e0e54bef06b954ec5a002c8f2 (diff) | |
| download | toolchains-7047874498641f6199233272bc4b81927a8b152a.tar.gz toolchains-7047874498641f6199233272bc4b81927a8b152a.tar.bz2 | |
Update libs to same as we are using for ppc-amigaos toolchain
Remove a patch that was giving us incorrect paths
| -rw-r--r-- | m68k-unknown-amigaos/Makefile | 8 | ||||
| -rw-r--r-- | m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p | 45 |
2 files changed, 4 insertions, 49 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..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 |