From 71c44996267ae1dd231c9803d41481db599ee5e0 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Sun, 16 Dec 2012 00:09:39 +0000 Subject: [PATCH] update devkitPPC to gcc 4.7.1 and gdb 7.4.1 --- README.TXT | 3 +- build-devkit.sh | 4 +- .../{gcc-4.6.3.patch => gcc-4.7.1.patch} | 64 +++++++++---------- .../{gdb-7.4.patch => gdb-7.4.1.patch} | 12 ++-- dkppc/scripts/build-gcc.sh | 2 +- select_toolchain.sh | 4 +- 6 files changed, 44 insertions(+), 45 deletions(-) rename dkppc/patches/{gcc-4.6.3.patch => gcc-4.7.1.patch} (85%) rename dkppc/patches/{gdb-7.4.patch => gdb-7.4.1.patch} (73%) diff --git a/README.TXT b/README.TXT index 87eb43d..f9702dc 100644 --- a/README.TXT +++ b/README.TXT @@ -13,8 +13,6 @@ Bison, Flex and Wget from the gnuwin32 project http://sourceforge.net/projects/gnuwin32/ -For devkitPSP a command line subversion client is required to get the PSP SDK http://www.tigris.org - required packages for building on debian/*buntu sudo apt-get install build-essential autoconf automake bison flex libncurses5-dev libreadline-dev texinfo @@ -30,6 +28,7 @@ Some of the tools for devkitARM and devkitPPC also require FreeImage, zlib, and http://freeimage.sourceforge.net/ http://www.zlib.net http://www.libusb.org + Downloading the source packages ------------------------------- diff --git a/build-devkit.sh b/build-devkit.sh index a1c2512..95b3f78 100755 --- a/build-devkit.sh +++ b/build-devkit.sh @@ -2,11 +2,11 @@ #--------------------------------------------------------------------------------- # Build scripts for # devkitARM release 42 -# devkitPPC release 26 +# devkitPPC release 27 # devkitPSP release 17 #--------------------------------------------------------------------------------- -if [ 1 -eq 1 ] ; then +if [ 0 -eq 1 ] ; then echo "Currently in release cycle, proceed with caution, do not report problems, do not ask for support." echo "Please use the latest release buildscripts unless advised otherwise by devkitPro staff." echo "http://sourceforge.net/projects/devkitpro/files/buildscripts/" diff --git a/dkppc/patches/gcc-4.6.3.patch b/dkppc/patches/gcc-4.7.1.patch similarity index 85% rename from dkppc/patches/gcc-4.6.3.patch rename to dkppc/patches/gcc-4.7.1.patch index 3496d3e..4574b9c 100644 --- a/dkppc/patches/gcc-4.6.3.patch +++ b/dkppc/patches/gcc-4.7.1.patch @@ -1,6 +1,6 @@ -diff -Nbaur gcc-4.6.3/gcc/config/rs6000/rs6000.h gcc-4.6.3-ppc/gcc/config/rs6000/rs6000.h ---- gcc-4.6.3/gcc/config/rs6000/rs6000.h 2011-07-27 19:17:15.000000000 +0100 -+++ gcc-4.6.3-ppc/gcc/config/rs6000/rs6000.h 2012-04-21 22:54:04.000000000 +0100 +diff -Nbaur gcc-4.7.1/gcc/config/rs6000/rs6000.h gcc-4.7.1-ppc/gcc/config/rs6000/rs6000.h +--- gcc-4.7.1/gcc/config/rs6000/rs6000.h 2012-04-12 22:00:07.000000000 +0100 ++++ gcc-4.7.1-ppc/gcc/config/rs6000/rs6000.h 2012-07-03 16:45:44.000000000 +0100 @@ -200,6 +200,7 @@ { "asm_cpu_476", ASM_CPU_476_SPEC }, \ SUBTARGET_EXTRA_SPECS @@ -18,10 +18,10 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/rs6000.h gcc-4.6.3-ppc/gcc/config/rs6000 #ifndef CC1_CPU_SPEC #ifdef HAVE_LOCAL_CPU_DETECT -diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/sysv4.h ---- gcc-4.6.3/gcc/config/rs6000/sysv4.h 2011-03-07 07:50:23.000000000 +0000 -+++ gcc-4.6.3-ppc/gcc/config/rs6000/sysv4.h 2012-04-21 22:54:04.000000000 +0100 -@@ -603,7 +603,11 @@ +diff -Nbaur gcc-4.7.1/gcc/config/rs6000/sysv4.h gcc-4.7.1-ppc/gcc/config/rs6000/sysv4.h +--- gcc-4.7.1/gcc/config/rs6000/sysv4.h 2012-04-30 18:39:01.000000000 +0100 ++++ gcc-4.7.1-ppc/gcc/config/rs6000/sysv4.h 2012-07-03 16:45:44.000000000 +0100 +@@ -593,7 +593,11 @@ /* Default starting address if specified. */ #define LINK_START_SPEC "\ @@ -34,7 +34,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/ myellowknife : %(link_start_yellowknife) ; \ mmvme : %(link_start_mvme) ; \ msim : %(link_start_sim) ; \ -@@ -641,7 +645,8 @@ +@@ -630,7 +634,8 @@ /* Any specific OS flags. */ #define LINK_OS_SPEC "\ @@ -44,7 +44,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/ myellowknife : %(link_os_yellowknife) ; \ mmvme : %(link_os_mvme) ; \ msim : %(link_os_sim) ; \ -@@ -660,7 +665,10 @@ +@@ -648,7 +653,10 @@ /* Override rs6000.h definition. */ #undef CPP_SPEC #define CPP_SPEC "%{posix: -D_POSIX_SOURCE} \ @@ -56,7 +56,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/ myellowknife : %(cpp_os_yellowknife) ; \ mmvme : %(cpp_os_mvme) ; \ msim : %(cpp_os_sim) ; \ -@@ -675,7 +683,10 @@ +@@ -662,7 +670,10 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC "\ @@ -68,7 +68,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/ myellowknife : %(startfile_yellowknife) ; \ mmvme : %(startfile_mvme) ; \ msim : %(startfile_sim) ; \ -@@ -686,11 +697,12 @@ +@@ -672,11 +683,12 @@ mcall-openbsd: %(startfile_openbsd) ; \ : %(startfile_default) }" @@ -83,7 +83,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/ myellowknife : %(lib_yellowknife) ; \ mmvme : %(lib_mvme) ; \ msim : %(lib_sim) ; \ -@@ -701,11 +713,12 @@ +@@ -686,11 +698,12 @@ mcall-openbsd: %(lib_openbsd) ; \ : %(lib_default) }" @@ -98,7 +98,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/ myellowknife : %(endfile_yellowknife) ; \ mmvme : %(endfile_mvme) ; \ msim : %(endfile_sim) ; \ -@@ -722,16 +735,27 @@ +@@ -706,16 +719,27 @@ /* Motorola ADS support. */ #define LIB_ADS_SPEC "--start-group -lads -lc --end-group" @@ -126,7 +126,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/ /* Motorola Yellowknife support. */ #define LIB_YELLOWKNIFE_SPEC "--start-group -lyk -lc --end-group" -@@ -926,6 +950,7 @@ +@@ -885,6 +909,7 @@ #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ { "crtsavres_default", CRTSAVRES_DEFAULT_SPEC }, \ @@ -134,7 +134,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/ { "lib_ads", LIB_ADS_SPEC }, \ { "lib_yellowknife", LIB_YELLOWKNIFE_SPEC }, \ { "lib_mvme", LIB_MVME_SPEC }, \ -@@ -936,6 +961,7 @@ +@@ -894,6 +919,7 @@ { "lib_netbsd", LIB_NETBSD_SPEC }, \ { "lib_openbsd", LIB_OPENBSD_SPEC }, \ { "lib_default", LIB_DEFAULT_SPEC }, \ @@ -142,7 +142,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/ { "startfile_ads", STARTFILE_ADS_SPEC }, \ { "startfile_yellowknife", STARTFILE_YELLOWKNIFE_SPEC }, \ { "startfile_mvme", STARTFILE_MVME_SPEC }, \ -@@ -946,6 +972,7 @@ +@@ -903,6 +929,7 @@ { "startfile_netbsd", STARTFILE_NETBSD_SPEC }, \ { "startfile_openbsd", STARTFILE_OPENBSD_SPEC }, \ { "startfile_default", STARTFILE_DEFAULT_SPEC }, \ @@ -150,7 +150,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/ { "endfile_ads", ENDFILE_ADS_SPEC }, \ { "endfile_yellowknife", ENDFILE_YELLOWKNIFE_SPEC }, \ { "endfile_mvme", ENDFILE_MVME_SPEC }, \ -@@ -959,7 +986,11 @@ +@@ -915,7 +942,11 @@ { "link_shlib", LINK_SHLIB_SPEC }, \ { "link_target", LINK_TARGET_SPEC }, \ { "link_start", LINK_START_SPEC }, \ @@ -162,7 +162,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-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 }, \ -@@ -970,6 +1001,7 @@ +@@ -925,6 +956,7 @@ { "link_start_openbsd", LINK_START_OPENBSD_SPEC }, \ { "link_start_default", LINK_START_DEFAULT_SPEC }, \ { "link_os", LINK_OS_SPEC }, \ @@ -170,7 +170,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-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 }, \ -@@ -984,6 +1016,9 @@ +@@ -938,6 +970,9 @@ { "cc1_endian_little", CC1_ENDIAN_LITTLE_SPEC }, \ { "cc1_endian_default", CC1_ENDIAN_DEFAULT_SPEC }, \ { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ @@ -180,10 +180,10 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-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-4.6.3/gcc/config/rs6000/sysv4.opt gcc-4.6.3-ppc/gcc/config/rs6000/sysv4.opt ---- gcc-4.6.3/gcc/config/rs6000/sysv4.opt 2011-01-03 20:52:22.000000000 +0000 -+++ gcc-4.6.3-ppc/gcc/config/rs6000/sysv4.opt 2012-04-21 22:54:04.000000000 +0100 -@@ -108,6 +108,26 @@ +diff -Nbaur gcc-4.7.1/gcc/config/rs6000/sysv4.opt gcc-4.7.1-ppc/gcc/config/rs6000/sysv4.opt +--- gcc-4.7.1/gcc/config/rs6000/sysv4.opt 2011-05-05 15:59:55.000000000 +0100 ++++ gcc-4.7.1-ppc/gcc/config/rs6000/sysv4.opt 2012-07-03 16:45:44.000000000 +0100 +@@ -121,6 +121,26 @@ Target RejectNegative Link with libads.a, libc.a and crt0.o @@ -210,22 +210,22 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.opt gcc-4.6.3-ppc/gcc/config/rs600 myellowknife Target RejectNegative Link with libyk.a, libc.a and crt0.o -diff -Nbaur gcc-4.6.3/gcc/config.gcc gcc-4.6.3-ppc/gcc/config.gcc ---- gcc-4.6.3/gcc/config.gcc 2011-07-22 17:44:50.000000000 +0100 -+++ gcc-4.6.3-ppc/gcc/config.gcc 2012-04-21 22:54:04.000000000 +0100 -@@ -2133,7 +2133,7 @@ +diff -Nbaur gcc-4.7.1/gcc/config.gcc gcc-4.7.1-ppc/gcc/config.gcc +--- gcc-4.7.1/gcc/config.gcc 2012-06-04 10:51:00.000000000 +0100 ++++ gcc-4.7.1-ppc/gcc/config.gcc 2012-07-03 16:45:44.000000000 +0100 +@@ -2011,7 +2011,7 @@ use_gcc_stdint=wrap ;; powerpc-*-eabi*) - tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h" + tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/750cl.h" extra_options="${extra_options} rs6000/sysv4.opt" - tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm" + tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm" use_gcc_stdint=wrap -diff -Nbaur gcc-4.6.3/libcpp/Makefile.in gcc-4.6.3-ppc/libcpp/Makefile.in ---- gcc-4.6.3/libcpp/Makefile.in 2012-03-01 12:03:46.000000000 +0000 -+++ gcc-4.6.3-ppc/libcpp/Makefile.in 2012-04-21 22:54:04.000000000 +0100 -@@ -212,8 +212,7 @@ +diff -Nbaur gcc-4.7.1/libcpp/Makefile.in gcc-4.7.1-ppc/libcpp/Makefile.in +--- gcc-4.7.1/libcpp/Makefile.in 2012-06-14 09:48:08.000000000 +0100 ++++ gcc-4.7.1-ppc/libcpp/Makefile.in 2012-07-03 16:45:44.000000000 +0100 +@@ -214,8 +214,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 # not atomically write the dependency output file. diff --git a/dkppc/patches/gdb-7.4.patch b/dkppc/patches/gdb-7.4.1.patch similarity index 73% rename from dkppc/patches/gdb-7.4.patch rename to dkppc/patches/gdb-7.4.1.patch index b580c36..ed14a31 100644 --- a/dkppc/patches/gdb-7.4.patch +++ b/dkppc/patches/gdb-7.4.1.patch @@ -1,6 +1,6 @@ -diff -Nbaur gdb-7.4/gdb/Makefile.in gdb-7.4-ppc/gdb/Makefile.in ---- gdb-7.4/gdb/Makefile.in 2012-01-06 04:43:01.000000000 +0000 -+++ gdb-7.4-ppc/gdb/Makefile.in 2012-01-28 15:56:00.000000000 +0000 +diff -Nbaur gdb-7.4.1/gdb/Makefile.in gdb-7.4.1-ppc/gdb/Makefile.in +--- gdb-7.4.1/gdb/Makefile.in 2012-01-06 04:43:01.000000000 +0000 ++++ gdb-7.4.1-ppc/gdb/Makefile.in 2012-07-03 17:36:24.000000000 +0100 @@ -2195,10 +2195,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 @@ -16,9 +16,9 @@ diff -Nbaur gdb-7.4/gdb/Makefile.in gdb-7.4-ppc/gdb/Makefile.in @GMAKE_TRUE@else @GMAKE_TRUE@override COMPILE.pre = source='$<' object='$@' libtool=no \ @GMAKE_TRUE@ DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC) -diff -Nbaur gdb-7.4/sim/ppc/Makefile.in gdb-7.4-ppc/sim/ppc/Makefile.in ---- gdb-7.4/sim/ppc/Makefile.in 2009-09-16 00:26:44.000000000 +0100 -+++ gdb-7.4-ppc/sim/ppc/Makefile.in 2012-02-25 13:30:02.000000000 +0000 +diff -Nbaur gdb-7.4.1/sim/ppc/Makefile.in gdb-7.4.1-ppc/sim/ppc/Makefile.in +--- gdb-7.4.1/sim/ppc/Makefile.in 2009-09-16 00:26:44.000000000 +0100 ++++ gdb-7.4.1-ppc/sim/ppc/Makefile.in 2012-07-03 17:36:24.000000000 +0100 @@ -551,7 +551,7 @@ PACKAGE_OBJ = @sim_pk_obj@ diff --git a/dkppc/scripts/build-gcc.sh b/dkppc/scripts/build-gcc.sh index 587717a..1fb9a32 100644 --- a/dkppc/scripts/build-gcc.sh +++ b/dkppc/scripts/build-gcc.sh @@ -87,7 +87,7 @@ then --with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \ --prefix=$prefix\ --disable-dependency-tracking \ - --with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitPPC release 26" \ + --with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitPPC release 27" \ $CROSS_PARAMS \ || { echo "Error configuring gcc stage 1"; exit 1; } touch configured-gcc diff --git a/select_toolchain.sh b/select_toolchain.sh index 885f33c..7b12a09 100644 --- a/select_toolchain.sh +++ b/select_toolchain.sh @@ -40,10 +40,10 @@ case "$VERSION" in toolchain=DEVKITARM ;; "2" ) - GCC_VER=4.6.3 + GCC_VER=4.7.1 BINUTILS_VER=2.22 NEWLIB_VER=1.20.0 - GDB_VER=7.4 + GDB_VER=7.4.1 basedir='dkppc' package=devkitPPC target=powerpc-eabi