From c9b0f0a9931b6045ca72f35e1b2aad5614ee4078 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Mon, 18 Jun 2012 12:44:30 +0100 Subject: [PATCH] changes for devkitARM release 41 --- build-devkit.sh | 2 +- .../{gcc-4.7.0.patch => gcc-4.7.1.patch} | 51 ++++++++----------- .../{gdb-7.4.patch => gdb-7.4.1.patch} | 43 ++++++++-------- dkarm-eabi/rules/base_rules | 2 +- dkarm-eabi/scripts/build-crtls.sh | 4 +- dkarm-eabi/scripts/build-gcc.sh | 2 +- select_toolchain.sh | 6 +-- 7 files changed, 49 insertions(+), 61 deletions(-) rename dkarm-eabi/patches/{gcc-4.7.0.patch => gcc-4.7.1.patch} (77%) rename dkarm-eabi/patches/{gdb-7.4.patch => gdb-7.4.1.patch} (62%) diff --git a/build-devkit.sh b/build-devkit.sh index 5ae97f5..05ec0da 100755 --- a/build-devkit.sh +++ b/build-devkit.sh @@ -45,7 +45,7 @@ ELF2DOL_VER=1.0.0 WIILOAD_VER=0.5.1 MMUTIL_VER=1.8.6 DFU_UTIL_VER=0.6 -STLINK_VER=0.5.3 +STLINK_VER=0.5.4 #--------------------------------------------------------------------------------- function extract_and_patch { diff --git a/dkarm-eabi/patches/gcc-4.7.0.patch b/dkarm-eabi/patches/gcc-4.7.1.patch similarity index 77% rename from dkarm-eabi/patches/gcc-4.7.0.patch rename to dkarm-eabi/patches/gcc-4.7.1.patch index 1f37596..ff0133c 100644 --- a/dkarm-eabi/patches/gcc-4.7.0.patch +++ b/dkarm-eabi/patches/gcc-4.7.1.patch @@ -1,6 +1,6 @@ -diff -Nbaur gcc-4.7.0/gcc/config/arm/t-arm-elf gcc-4.7.0-arm/gcc/config/arm/t-arm-elf ---- gcc-4.7.0/gcc/config/arm/t-arm-elf 2011-11-02 15:23:48.000000000 +0000 -+++ gcc-4.7.0-arm/gcc/config/arm/t-arm-elf 2012-04-26 14:09:06.000000000 +0100 +diff -Nbaur gcc-4.7.1/gcc/config/arm/t-arm-elf gcc-4.7.1-arm/gcc/config/arm/t-arm-elf +--- gcc-4.7.1/gcc/config/arm/t-arm-elf 2011-11-02 15:23:48.000000000 +0000 ++++ gcc-4.7.1-arm/gcc/config/arm/t-arm-elf 2012-06-15 19:36:09.000000000 +0100 @@ -26,22 +26,44 @@ #MULTILIB_DIRNAMES += fa526 fa626 fa606te fa626te fmp626 fa726te #MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=fa526 *mthumb*/*mcpu=fa626 @@ -71,18 +71,18 @@ diff -Nbaur gcc-4.7.0/gcc/config/arm/t-arm-elf gcc-4.7.0-arm/gcc/config/arm/t-ar # # MULTILIB_OPTIONS += mfloat-abi=hard/mfloat-abi=soft # MULTILIB_DIRNAMES += fpu soft -diff -Nbaur gcc-4.7.0/gcc/config/arm/unknown-elf.h gcc-4.7.0-arm/gcc/config/arm/unknown-elf.h ---- gcc-4.7.0/gcc/config/arm/unknown-elf.h 2011-03-31 13:13:13.000000000 +0100 -+++ gcc-4.7.0-arm/gcc/config/arm/unknown-elf.h 2012-04-26 14:09:07.000000000 +0100 +diff -Nbaur gcc-4.7.1/gcc/config/arm/unknown-elf.h gcc-4.7.1-arm/gcc/config/arm/unknown-elf.h +--- gcc-4.7.1/gcc/config/arm/unknown-elf.h 2011-03-31 13:13:13.000000000 +0100 ++++ gcc-4.7.1-arm/gcc/config/arm/unknown-elf.h 2012-06-15 19:36:09.000000000 +0100 @@ -94,4 +94,4 @@ udivmoddi4, which will depend on the exception unwind routines, which will depend on abort, which is defined in libc. */ #undef LINK_GCC_C_SEQUENCE_SPEC -#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L --end-group" +#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group" -diff -Nbaur gcc-4.7.0/gcc/gcc.c gcc-4.7.0-arm/gcc/gcc.c ---- gcc-4.7.0/gcc/gcc.c 2012-02-28 17:31:38.000000000 +0000 -+++ gcc-4.7.0-arm/gcc/gcc.c 2012-04-26 14:09:07.000000000 +0100 +diff -Nbaur gcc-4.7.1/gcc/gcc.c gcc-4.7.1-arm/gcc/gcc.c +--- gcc-4.7.1/gcc/gcc.c 2012-02-28 17:31:38.000000000 +0000 ++++ gcc-4.7.1-arm/gcc/gcc.c 2012-06-15 19:36:09.000000000 +0100 @@ -548,6 +548,11 @@ #endif #endif @@ -111,20 +111,9 @@ diff -Nbaur gcc-4.7.0/gcc/gcc.c gcc-4.7.0-arm/gcc/gcc.c INIT_STATIC_SPEC ("startfile", &startfile_spec), INIT_STATIC_SPEC ("cross_compile", &cross_compile), INIT_STATIC_SPEC ("version", &compiler_version), -diff -Nbaur gcc-4.7.0/gcc/tree-ssa-pre.c gcc-4.7.0-arm/gcc/tree-ssa-pre.c ---- gcc-4.7.0/gcc/tree-ssa-pre.c 2012-02-15 00:10:00.000000000 +0000 -+++ gcc-4.7.0-arm/gcc/tree-ssa-pre.c 2012-04-26 14:09:43.000000000 +0100 -@@ -4337,6 +4337,7 @@ - has the same value number as its rhs. If so, the store is - dead. */ - else if (gimple_assign_single_p (stmt) -+ && !gimple_has_volatile_ops (stmt) - && !is_gimple_reg (gimple_assign_lhs (stmt)) - && (TREE_CODE (rhs) == SSA_NAME - || is_gimple_min_invariant (rhs))) -diff -Nbaur gcc-4.7.0/libcpp/Makefile.in gcc-4.7.0-arm/libcpp/Makefile.in ---- gcc-4.7.0/libcpp/Makefile.in 2012-03-22 07:37:39.000000000 +0000 -+++ gcc-4.7.0-arm/libcpp/Makefile.in 2012-04-26 14:09:08.000000000 +0100 +diff -Nbaur gcc-4.7.1/libcpp/Makefile.in gcc-4.7.1-arm/libcpp/Makefile.in +--- gcc-4.7.1/libcpp/Makefile.in 2012-06-14 09:48:08.000000000 +0100 ++++ gcc-4.7.1-arm/libcpp/Makefile.in 2012-06-15 19:36:11.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 @@ -135,15 +124,15 @@ diff -Nbaur gcc-4.7.0/libcpp/Makefile.in gcc-4.7.0-arm/libcpp/Makefile.in else COMPILE = source='$<' object='$@' libtool=no DEPDIR=$(DEPDIR) $(DEPMODE) \ $(depcomp) $(COMPILE.base) -diff -Nbaur gcc-4.7.0/libgcc/Makefile.in gcc-4.7.0-arm/libgcc/Makefile.in ---- gcc-4.7.0/libgcc/Makefile.in 2011-11-22 03:01:02.000000000 +0000 -+++ gcc-4.7.0-arm/libgcc/Makefile.in 2012-04-26 14:09:09.000000000 +0100 +diff -Nbaur gcc-4.7.1/libgcc/Makefile.in gcc-4.7.1-arm/libgcc/Makefile.in +--- gcc-4.7.1/libgcc/Makefile.in 2012-05-24 15:59:38.000000000 +0100 ++++ gcc-4.7.1-arm/libgcc/Makefile.in 2012-06-16 13:58:38.000000000 +0100 @@ -500,14 +500,14 @@ lib2-divmod-o = $(patsubst %,%$(objext),$(LIB2_DIVMOD_FUNCS)) $(lib2-divmod-o): %$(objext): $(srcdir)/libgcc2.c $(gcc_compile) -DL$* -c $< \ - -fexceptions -fnon-call-exceptions $(vis_hide) -+ -fno-exceptions -fnon-call-exceptions $(vis_hide) ++ -fno-exceptions -fno-non-call-exceptions $(vis_hide) libgcc-objects += $(lib2-divmod-o) ifeq ($(enable_shared),yes) @@ -151,7 +140,7 @@ diff -Nbaur gcc-4.7.0/libgcc/Makefile.in gcc-4.7.0-arm/libgcc/Makefile.in $(lib2-divmod-s-o): %_s$(objext): $(srcdir)/libgcc2.c $(gcc_s_compile) -DL$* -c $< \ - -fexceptions -fnon-call-exceptions -+ -fno-exceptions -fnon-call-exceptions ++ -fno-exceptions -fno-non-call-exceptions libgcc-s-objects += $(lib2-divmod-s-o) endif @@ -164,9 +153,9 @@ diff -Nbaur gcc-4.7.0/libgcc/Makefile.in gcc-4.7.0-arm/libgcc/Makefile.in ifeq ($(enable_shared),yes) -diff -Nbaur gcc-4.7.0/libgcc/crtstuff.c gcc-4.7.0-arm/libgcc/crtstuff.c ---- gcc-4.7.0/libgcc/crtstuff.c 2011-12-06 21:35:41.000000000 +0000 -+++ gcc-4.7.0-arm/libgcc/crtstuff.c 2012-04-26 14:09:08.000000000 +0100 +diff -Nbaur gcc-4.7.1/libgcc/crtstuff.c gcc-4.7.1-arm/libgcc/crtstuff.c +--- gcc-4.7.1/libgcc/crtstuff.c 2011-12-06 21:35:41.000000000 +0000 ++++ gcc-4.7.1-arm/libgcc/crtstuff.c 2012-06-15 19:36:11.000000000 +0100 @@ -49,7 +49,7 @@ /* Target machine header files require this define. */ diff --git a/dkarm-eabi/patches/gdb-7.4.patch b/dkarm-eabi/patches/gdb-7.4.1.patch similarity index 62% rename from dkarm-eabi/patches/gdb-7.4.patch rename to dkarm-eabi/patches/gdb-7.4.1.patch index 986d05d..f36f628 100644 --- a/dkarm-eabi/patches/gdb-7.4.patch +++ b/dkarm-eabi/patches/gdb-7.4.1.patch @@ -1,25 +1,7 @@ -diff -Nbaur gdb-7.4/gdb/Makefile.in gdb-7.4-arm/gdb/Makefile.in ---- gdb-7.4/gdb/Makefile.in 2012-01-06 04:43:01.000000000 +0000 -+++ gdb-7.4-arm/gdb/Makefile.in 2012-02-28 03:07:12.000000000 +0000 -@@ -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 - # 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 -Nbaur gdb-7.4/sim/common/Make-common.in gdb-7.4-arm/sim/common/Make-common.in ---- gdb-7.4/sim/common/Make-common.in 2012-01-06 04:54:38.000000000 +0000 -+++ gdb-7.4-arm/sim/common/Make-common.in 2012-02-28 03:07:41.000000000 +0000 -@@ -417,10 +417,7 @@ +diff -Nbaur gdb-7.4.1/gdb/Makefile.in gdb-7.4.1-arm/gdb/Makefile.in +--- gdb-7.4.1/gdb/Makefile.in 2012-01-06 04:43:01.000000000 +0000 ++++ gdb-7.4.1-arm/gdb/Makefile.in 2012-06-18 11:40:57.000000000 +0100 +@@ -2195,10 +2195,8 @@ # 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. @@ -28,6 +10,23 @@ diff -Nbaur gdb-7.4/sim/common/Make-common.in gdb-7.4-arm/sim/common/Make-common -@GMAKE_TRUE@override POSTCOMPILE = @mv $(DEPDIR)/$(basename $(@F)).Tpo \ -@GMAKE_TRUE@ $(DEPDIR)/$(basename $(@F)).Po +@GMAKE_TRUE@override COMPILE.post = -c -o $@ ++@GMAKE_TRUE@override POSTCOMPILE = + @GMAKE_TRUE@else + @GMAKE_TRUE@override COMPILE.pre = source='$<' object='$@' libtool=no \ + @GMAKE_TRUE@ DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC) +diff -Nbaur gdb-7.4.1/sim/common/Make-common.in gdb-7.4.1-arm/sim/common/Make-common.in +--- gdb-7.4.1/sim/common/Make-common.in 2012-01-06 04:54:38.000000000 +0000 ++++ gdb-7.4.1-arm/sim/common/Make-common.in 2012-06-18 11:25:26.000000000 +0100 +@@ -417,10 +417,8 @@ + # 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 $@ ++@GMAKE_TRUE@override POSTCOMPILE = @GMAKE_TRUE@else @GMAKE_TRUE@override COMPILE.pre = source='$<' object='$@' libtool=no \ @GMAKE_TRUE@ DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC) diff --git a/dkarm-eabi/rules/base_rules b/dkarm-eabi/rules/base_rules index 8924da7..35e9140 100644 --- a/dkarm-eabi/rules/base_rules +++ b/dkarm-eabi/rules/base_rules @@ -18,7 +18,7 @@ export PATH := $(DEVKITARM)/bin:$(PORTLIBS)/bin:$(PATH) #--------------------------------------------------------------------------------- # the prefix on the compiler executables #--------------------------------------------------------------------------------- -PREFIX := arm-eabi- +PREFIX := arm-none-eabi- export CC := $(PREFIX)gcc export CXX := $(PREFIX)g++ diff --git a/dkarm-eabi/scripts/build-crtls.sh b/dkarm-eabi/scripts/build-crtls.sh index 9114282..36eb928 100644 --- a/dkarm-eabi/scripts/build-crtls.sh +++ b/dkarm-eabi/scripts/build-crtls.sh @@ -12,8 +12,8 @@ cp -v $BUILDSCRIPTDIR/dkarm-eabi/rules/* $prefix # Install and build the gba crt #--------------------------------------------------------------------------------- -cp -v $BUILDSCRIPTDIR/dkarm-eabi/crtls/* $prefix/arm-eabi/lib/ -cd $prefix/arm-eabi/lib/ +cp -v $BUILDSCRIPTDIR/dkarm-eabi/crtls/* $prefix/$target/lib/ +cd $prefix/$target/lib/ $MAKE CRT=gba $MAKE CRT=gp32 $MAKE CRT=er diff --git a/dkarm-eabi/scripts/build-gcc.sh b/dkarm-eabi/scripts/build-gcc.sh index 0da35b8..e8f7812 100644 --- a/dkarm-eabi/scripts/build-gcc.sh +++ b/dkarm-eabi/scripts/build-gcc.sh @@ -54,7 +54,7 @@ then --with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \ --prefix=$prefix \ --enable-lto $plugin_ld\ - --with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 40" \ + --with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 41" \ $CROSS_PARAMS \ || { echo "Error configuring gcc"; exit 1; } touch configured-gcc diff --git a/select_toolchain.sh b/select_toolchain.sh index ab53fe4..8ae289f 100644 --- a/select_toolchain.sh +++ b/select_toolchain.sh @@ -18,13 +18,13 @@ done case "$VERSION" in "1" ) - GCC_VER=4.7.0 + GCC_VER=4.7.1 BINUTILS_VER=2.22 NEWLIB_VER=1.20.0 - GDB_VER=7.4 + GDB_VER=7.4.1 basedir='dkarm-eabi' package=devkitARM - target=arm-eabi + target=arm-none-eabi toolchain=DEVKITARM ;; "2" )