From b56e3bcd13cf7ee532fd1b1e6b7d3dd8a8d0bc0c Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Wed, 18 Oct 2017 17:32:13 +0100 Subject: [PATCH] update binutils, gcc & gdb versions --- .../{gcc-6.2.0.patch => gcc-6.4.0.patch} | 97 ++++++++----------- dkppc/patches/gdb-7.11.patch | 18 ---- dkppc/scripts/build-gcc.sh | 2 +- select_toolchain.sh | 5 +- 4 files changed, 44 insertions(+), 78 deletions(-) rename dkppc/patches/{gcc-6.2.0.patch => gcc-6.4.0.patch} (77%) delete mode 100644 dkppc/patches/gdb-7.11.patch diff --git a/dkppc/patches/gcc-6.2.0.patch b/dkppc/patches/gcc-6.4.0.patch similarity index 77% rename from dkppc/patches/gcc-6.2.0.patch rename to dkppc/patches/gcc-6.4.0.patch index 8a24aff..f2e8e3b 100644 --- a/dkppc/patches/gcc-6.2.0.patch +++ b/dkppc/patches/gcc-6.4.0.patch @@ -1,6 +1,6 @@ -diff -NBaur gcc-6.1.0/gcc/config/rs6000/rs6000.h gcc-6.1.0-ppc/gcc/config/rs6000/rs6000.h ---- gcc-6.1.0/gcc/config/rs6000/rs6000.h 2016-01-20 20:30:24.000000000 +0000 -+++ gcc-6.1.0-ppc/gcc/config/rs6000/rs6000.h 2016-05-20 12:10:24.645019640 +0100 +diff -NBaur gcc-6.3.0/gcc/config/rs6000/rs6000.h gcc-6.3.0-ppc/gcc/config/rs6000/rs6000.h +--- gcc-6.3.0/gcc/config/rs6000/rs6000.h 2016-07-07 20:42:07.000000000 +0100 ++++ gcc-6.3.0-ppc/gcc/config/rs6000/rs6000.h 2017-01-05 02:42:41.980000000 +0000 @@ -205,6 +205,7 @@ { "asm_cpu_476", ASM_CPU_476_SPEC }, \ SUBTARGET_EXTRA_SPECS @@ -18,9 +18,9 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/rs6000.h gcc-6.1.0-ppc/gcc/config/rs6000 #ifndef CC1_CPU_SPEC #ifdef HAVE_LOCAL_CPU_DETECT -diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/sysv4.h ---- gcc-6.1.0/gcc/config/rs6000/sysv4.h 2016-01-04 14:30:50.000000000 +0000 -+++ gcc-6.1.0-ppc/gcc/config/rs6000/sysv4.h 2016-05-20 12:12:27.073019640 +0100 +diff -NBaur gcc-6.3.0/gcc/config/rs6000/sysv4.h gcc-6.3.0-ppc/gcc/config/rs6000/sysv4.h +--- gcc-6.3.0/gcc/config/rs6000/sysv4.h 2016-05-16 14:47:47.000000000 +0100 ++++ gcc-6.3.0-ppc/gcc/config/rs6000/sysv4.h 2017-01-05 02:46:27.020000000 +0000 @@ -559,7 +559,12 @@ /* Default starting address if specified. */ @@ -35,7 +35,7 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/ myellowknife : %(link_start_yellowknife) ; \ mmvme : %(link_start_mvme) ; \ msim : %(link_start_sim) ; \ -@@ -590,7 +594,9 @@ +@@ -590,7 +595,9 @@ /* Any specific OS flags. */ #define LINK_OS_SPEC "\ @@ -46,7 +46,7 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/ myellowknife : %(link_os_yellowknife) ; \ mmvme : %(link_os_mvme) ; \ msim : %(link_os_sim) ; \ -@@ -608,7 +613,11 @@ +@@ -608,7 +615,11 @@ /* Override rs6000.h definition. */ #undef CPP_SPEC #define CPP_SPEC "%{posix: -D_POSIX_SOURCE} \ @@ -59,7 +59,7 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/ myellowknife : %(cpp_os_yellowknife) ; \ mmvme : %(cpp_os_mvme) ; \ msim : %(cpp_os_sim) ; \ -@@ -622,7 +630,11 @@ +@@ -622,7 +633,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC "\ @@ -72,12 +72,7 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/ myellowknife : %(startfile_yellowknife) ; \ mmvme : %(startfile_mvme) ; \ msim : %(startfile_sim) ; \ -@@ -632,11 +643,13 @@ - mcall-openbsd: %(startfile_openbsd) ; \ - : %(startfile_default) }" - --#define STARTFILE_DEFAULT_SPEC "ecrti.o%s crtbegin.o%s" -+#define STARTFILE_DEFAULT_SPEC "crt0.o%s ecrti.o%s crtbegin.o%s" +@@ -636,7 +651,9 @@ #undef LIB_SPEC #define LIB_SPEC "\ @@ -88,7 +83,7 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/ myellowknife : %(lib_yellowknife) ; \ mmvme : %(lib_mvme) ; \ msim : %(lib_sim) ; \ -@@ -646,11 +658,13 @@ +@@ -646,11 +663,13 @@ mcall-openbsd: %(lib_openbsd) ; \ : %(lib_default) }" @@ -104,7 +99,7 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/ myellowknife : %(endfile_yellowknife) ; \ mmvme : %(endfile_mvme) ; \ msim : %(endfile_sim) ; \ -@@ -666,16 +679,33 @@ +@@ -666,16 +685,33 @@ /* Motorola ADS support. */ #define LIB_ADS_SPEC "--start-group -lads -lc --end-group" @@ -138,7 +133,7 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/ /* Motorola Yellowknife support. */ #define LIB_YELLOWKNIFE_SPEC "--start-group -lyk -lc --end-group" -@@ -855,6 +879,8 @@ +@@ -866,6 +902,8 @@ #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ { "crtsavres_default", CRTSAVRES_DEFAULT_SPEC }, \ @@ -147,7 +142,7 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/ { "lib_ads", LIB_ADS_SPEC }, \ { "lib_yellowknife", LIB_YELLOWKNIFE_SPEC }, \ { "lib_mvme", LIB_MVME_SPEC }, \ -@@ -864,6 +889,8 @@ +@@ -875,6 +913,8 @@ { "lib_netbsd", LIB_NETBSD_SPEC }, \ { "lib_openbsd", LIB_OPENBSD_SPEC }, \ { "lib_default", LIB_DEFAULT_SPEC }, \ @@ -156,7 +151,7 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/ { "startfile_ads", STARTFILE_ADS_SPEC }, \ { "startfile_yellowknife", STARTFILE_YELLOWKNIFE_SPEC }, \ { "startfile_mvme", STARTFILE_MVME_SPEC }, \ -@@ -873,6 +899,8 @@ +@@ -884,6 +924,8 @@ { "startfile_netbsd", STARTFILE_NETBSD_SPEC }, \ { "startfile_openbsd", STARTFILE_OPENBSD_SPEC }, \ { "startfile_default", STARTFILE_DEFAULT_SPEC }, \ @@ -165,7 +160,7 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/ { "endfile_ads", ENDFILE_ADS_SPEC }, \ { "endfile_yellowknife", ENDFILE_YELLOWKNIFE_SPEC }, \ { "endfile_mvme", ENDFILE_MVME_SPEC }, \ -@@ -884,7 +911,12 @@ +@@ -895,7 +937,12 @@ { "endfile_default", ENDFILE_DEFAULT_SPEC }, \ { "link_shlib", LINK_SHLIB_SPEC }, \ { "link_start", LINK_START_SPEC }, \ @@ -178,7 +173,7 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/ { "link_start_yellowknife", LINK_START_YELLOWKNIFE_SPEC }, \ { "link_start_mvme", LINK_START_MVME_SPEC }, \ { "link_start_sim", LINK_START_SIM_SPEC }, \ -@@ -894,6 +925,8 @@ +@@ -905,6 +952,8 @@ { "link_start_openbsd", LINK_START_OPENBSD_SPEC }, \ { "link_start_default", LINK_START_DEFAULT_SPEC }, \ { "link_os", LINK_OS_SPEC }, \ @@ -187,7 +182,7 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/ { "link_os_ads", LINK_OS_ADS_SPEC }, \ { "link_os_yellowknife", LINK_OS_YELLOWKNIFE_SPEC }, \ { "link_os_mvme", LINK_OS_MVME_SPEC }, \ -@@ -905,6 +937,10 @@ +@@ -916,6 +965,10 @@ { "link_os_default", LINK_OS_DEFAULT_SPEC }, \ { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ { "link_secure_plt", LINK_SECURE_PLT_SPEC }, \ @@ -198,9 +193,9 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.h gcc-6.1.0-ppc/gcc/config/rs6000/ { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ -diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.opt gcc-6.1.0-ppc/gcc/config/rs6000/sysv4.opt ---- gcc-6.1.0/gcc/config/rs6000/sysv4.opt 2016-01-04 14:30:50.000000000 +0000 -+++ gcc-6.1.0-ppc/gcc/config/rs6000/sysv4.opt 2016-05-20 12:10:24.649019640 +0100 +diff -NBaur gcc-6.3.0/gcc/config/rs6000/sysv4.opt gcc-6.3.0-ppc/gcc/config/rs6000/sysv4.opt +--- gcc-6.3.0/gcc/config/rs6000/sysv4.opt 2016-01-04 14:30:50.000000000 +0000 ++++ gcc-6.3.0-ppc/gcc/config/rs6000/sysv4.opt 2017-01-05 02:42:41.984000000 +0000 @@ -120,6 +120,30 @@ Target RejectNegative Link with libads.a, libc.a and crt0.o. @@ -232,10 +227,10 @@ diff -NBaur gcc-6.1.0/gcc/config/rs6000/sysv4.opt gcc-6.1.0-ppc/gcc/config/rs600 myellowknife Target RejectNegative Link with libyk.a, libc.a and crt0.o. -diff -NBaur gcc-6.1.0/gcc/config.gcc gcc-6.1.0-ppc/gcc/config.gcc ---- gcc-6.1.0/gcc/config.gcc 2016-04-11 11:14:59.000000000 +0100 -+++ gcc-6.1.0-ppc/gcc/config.gcc 2016-05-20 12:10:24.661019640 +0100 -@@ -2381,7 +2381,7 @@ +diff -NBaur gcc-6.3.0/gcc/config.gcc gcc-6.3.0-ppc/gcc/config.gcc +--- gcc-6.3.0/gcc/config.gcc 2016-11-07 21:38:43.000000000 +0000 ++++ gcc-6.3.0-ppc/gcc/config.gcc 2017-01-05 02:42:41.984000000 +0000 +@@ -2390,7 +2390,7 @@ use_gcc_stdint=wrap ;; powerpc-*-eabi*) @@ -244,9 +239,9 @@ diff -NBaur gcc-6.1.0/gcc/config.gcc gcc-6.1.0-ppc/gcc/config.gcc extra_options="${extra_options} rs6000/sysv4.opt" tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm" use_gcc_stdint=wrap -diff -NBaur gcc-6.1.0/gcc/Makefile.in gcc-6.1.0-ppc/gcc/Makefile.in ---- gcc-6.1.0/gcc/Makefile.in 2016-04-15 12:49:39.000000000 +0100 -+++ gcc-6.1.0-ppc/gcc/Makefile.in 2016-05-20 12:10:24.641019640 +0100 +diff -NBaur gcc-6.3.0/gcc/Makefile.in gcc-6.3.0-ppc/gcc/Makefile.in +--- gcc-6.3.0/gcc/Makefile.in 2016-11-22 17:33:07.000000000 +0000 ++++ gcc-6.3.0-ppc/gcc/Makefile.in 2017-01-05 02:42:41.988000000 +0000 @@ -1073,8 +1073,8 @@ # things like the go/%.o rule work properly; but we use $(*F) for the # file part, as we just want the file part of the stem, not the entire @@ -258,9 +253,9 @@ diff -NBaur gcc-6.1.0/gcc/Makefile.in gcc-6.1.0-ppc/gcc/Makefile.in else COMPILE = source='$<' object='$@' libtool=no \ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) $(COMPILE.base) -diff -NBaur gcc-6.1.0/libcpp/Makefile.in gcc-6.1.0-ppc/libcpp/Makefile.in ---- gcc-6.1.0/libcpp/Makefile.in 2016-04-27 09:22:11.000000000 +0100 -+++ gcc-6.1.0-ppc/libcpp/Makefile.in 2016-05-20 12:10:24.661019640 +0100 +diff -NBaur gcc-6.3.0/libcpp/Makefile.in gcc-6.3.0-ppc/libcpp/Makefile.in +--- gcc-6.3.0/libcpp/Makefile.in 2016-12-21 07:53:39.000000000 +0000 ++++ gcc-6.3.0-ppc/libcpp/Makefile.in 2017-01-05 02:42:41.988000000 +0000 @@ -208,8 +208,7 @@ # Note that we put the dependencies into a .Tpo file, then move them # into place if the compile succeeds. We need this because gcc does @@ -271,9 +266,9 @@ diff -NBaur gcc-6.1.0/libcpp/Makefile.in gcc-6.1.0-ppc/libcpp/Makefile.in else COMPILE = source='$<' object='$@' libtool=no DEPDIR=$(DEPDIR) $(DEPMODE) \ $(depcomp) $(COMPILE.base) -diff -NBaur gcc-6.1.0/libgcc/config/rs6000/crtrestvr.S gcc-6.1.0-ppc/libgcc/config/rs6000/crtrestvr.S ---- gcc-6.1.0/libgcc/config/rs6000/crtrestvr.S 2016-01-04 14:30:50.000000000 +0000 -+++ gcc-6.1.0-ppc/libgcc/config/rs6000/crtrestvr.S 2016-05-20 12:10:24.665019640 +0100 +diff -NBaur gcc-6.3.0/libgcc/config/rs6000/crtrestvr.S gcc-6.3.0-ppc/libgcc/config/rs6000/crtrestvr.S +--- gcc-6.3.0/libgcc/config/rs6000/crtrestvr.S 2016-01-04 14:30:50.000000000 +0000 ++++ gcc-6.3.0-ppc/libgcc/config/rs6000/crtrestvr.S 2017-01-05 02:42:41.988000000 +0000 @@ -24,7 +24,7 @@ /* On PowerPC64 Linux, these functions are provided by the linker. */ @@ -288,9 +283,9 @@ diff -NBaur gcc-6.1.0/libgcc/config/rs6000/crtrestvr.S gcc-6.1.0-ppc/libgcc/conf #endif +#endif -diff -NBaur gcc-6.1.0/libgcc/config/rs6000/crtsavevr.S gcc-6.1.0-ppc/libgcc/config/rs6000/crtsavevr.S ---- gcc-6.1.0/libgcc/config/rs6000/crtsavevr.S 2016-01-04 14:30:50.000000000 +0000 -+++ gcc-6.1.0-ppc/libgcc/config/rs6000/crtsavevr.S 2016-05-20 12:10:24.665019640 +0100 +diff -NBaur gcc-6.3.0/libgcc/config/rs6000/crtsavevr.S gcc-6.3.0-ppc/libgcc/config/rs6000/crtsavevr.S +--- gcc-6.3.0/libgcc/config/rs6000/crtsavevr.S 2016-01-04 14:30:50.000000000 +0000 ++++ gcc-6.3.0-ppc/libgcc/config/rs6000/crtsavevr.S 2017-01-05 02:42:41.988000000 +0000 @@ -24,7 +24,7 @@ /* On PowerPC64 Linux, these functions are provided by the linker. */ @@ -305,9 +300,9 @@ diff -NBaur gcc-6.1.0/libgcc/config/rs6000/crtsavevr.S gcc-6.1.0-ppc/libgcc/conf #endif +#endif -diff -NBaur gcc-6.1.0/libgcc/crtstuff.c gcc-6.1.0-ppc/libgcc/crtstuff.c ---- gcc-6.1.0/libgcc/crtstuff.c 2016-01-04 14:30:50.000000000 +0000 -+++ gcc-6.1.0-ppc/libgcc/crtstuff.c 2016-05-20 12:10:24.669019640 +0100 +diff -NBaur gcc-6.3.0/libgcc/crtstuff.c gcc-6.3.0-ppc/libgcc/crtstuff.c +--- gcc-6.3.0/libgcc/crtstuff.c 2016-01-04 14:30:50.000000000 +0000 ++++ gcc-6.3.0-ppc/libgcc/crtstuff.c 2017-01-05 02:42:41.988000000 +0000 @@ -47,6 +47,7 @@ /* Target machine header files require this define. */ @@ -316,15 +311,3 @@ diff -NBaur gcc-6.1.0/libgcc/crtstuff.c gcc-6.1.0-ppc/libgcc/crtstuff.c /* FIXME: Including auto-host is incorrect, but until we have identified the set of defines that need to go into auto-target.h, -diff -NBaur gcc-6.1.0/libstdc++-v3/include/std/type_traits gcc-6.1.0-ppc/libstdc++-v3/include/std/type_traits ---- gcc-6.1.0/libstdc++-v3/include/std/type_traits 2016-01-12 21:19:58.000000000 +0000 -+++ gcc-6.1.0-ppc/libstdc++-v3/include/std/type_traits 2016-05-20 12:10:24.669019640 +0100 -@@ -38,7 +38,7 @@ - #include - - #ifdef _GLIBCXX_USE_C99_STDINT_TR1 --# if defined (__UINT_LEAST16_TYPE__) && defined(__UINT_LEAST32_TYPE__) -+# if defined (__UINT_LEAST16_TYPE__) && defined(__UINT_LEAST32_TYPE__) && 0 - namespace std - { - typedef __UINT_LEAST16_TYPE__ uint_least16_t; diff --git a/dkppc/patches/gdb-7.11.patch b/dkppc/patches/gdb-7.11.patch deleted file mode 100644 index 879ea5b..0000000 --- a/dkppc/patches/gdb-7.11.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -NBaur gdb-7.10/gdb/Makefile.in gdb-7.10-ppc/gdb/Makefile.in ---- gdb-7.10/gdb/Makefile.in 2015-08-28 22:22:07.000000000 +0100 -+++ gdb-7.10-ppc/gdb/Makefile.in 2015-11-09 09:21:13.228003995 +0000 -@@ -2676,10 +2676,10 @@ - # Note that we put the dependencies into a .Tpo file, then move them - # into place if the compile succeeds. We need this because gcc does - # not atomically write the dependency output file. --@GMAKE_TRUE@override COMPILE.post = -c -o $@ -MT $@ -MMD -MP \ --@GMAKE_TRUE@ -MF $(DEPDIR)/$(basename $(@F)).Tpo --@GMAKE_TRUE@override POSTCOMPILE = @mv $(DEPDIR)/$(basename $(@F)).Tpo \ --@GMAKE_TRUE@ $(DEPDIR)/$(basename $(@F)).Po -+#@GMAKE_TRUE@override COMPILE.post = -c -o $@ -MT $@ -MMD -MP \ -+#@GMAKE_TRUE@ -MF $(DEPDIR)/$(basename $(@F)).Tpo -+#@GMAKE_TRUE@override POSTCOMPILE = @mv $(DEPDIR)/$(basename $(@F)).Tpo \ -+#@GMAKE_TRUE@ $(DEPDIR)/$(basename $(@F)).Po - @GMAKE_TRUE@else - @GMAKE_TRUE@override COMPILE.pre = source='$<' object='$@' libtool=no \ - @GMAKE_TRUE@ DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC) diff --git a/dkppc/scripts/build-gcc.sh b/dkppc/scripts/build-gcc.sh index b14fccb..125fba9 100755 --- a/dkppc/scripts/build-gcc.sh +++ b/dkppc/scripts/build-gcc.sh @@ -95,7 +95,7 @@ then --with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \ --prefix=$prefix\ --with-system-zlib\ - --with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitPPC release 30 alpha" \ + --with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 30" \ $CROSS_PARAMS \ || { echo "Error configuring gcc stage 1"; exit 1; } touch configured-gcc diff --git a/select_toolchain.sh b/select_toolchain.sh index 66046f5..f11819a 100755 --- a/select_toolchain.sh +++ b/select_toolchain.sh @@ -40,11 +40,12 @@ case "$VERSION" in toolchain=DEVKITARM ;; "2" ) - GCC_VER=7.1.0 + GCC_VER=6.4.0 BINUTILS_VER=2.28 MN_BINUTILS_VER=2.17 NEWLIB_VER=2.5.0 - GDB_VER=8.0 + GDB_VER=8.0.1 +>>>>>>> update binutils, gcc & gdb versions basedir='dkppc' package=devkitPPC target=powerpc-eabi