mirror of
https://github.com/devkitPro/buildscripts.git
synced 2026-09-09 11:05:22 -05:00
use gcc 4.7.0 for devkitARM & devkitPPC
This commit is contained in:
Dave Murphy
@@ -1,7 +1,7 @@
|
||||
diff -Nbaur gcc-4.6.3/gcc/config/arm/t-arm-elf gcc-4.6.3-arm/gcc/config/arm/t-arm-elf
|
||||
--- gcc-4.6.3/gcc/config/arm/t-arm-elf 2011-01-03 20:52:22.000000000 +0000
|
||||
+++ gcc-4.6.3-arm/gcc/config/arm/t-arm-elf 2012-03-19 12:16:39.000000000 +0000
|
||||
@@ -40,22 +40,44 @@
|
||||
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-03-23 14:17:25.000000000 +0000
|
||||
@@ -26,22 +26,44 @@
|
||||
#MULTILIB_DIRNAMES += fa526 fa626 fa606te fa626te fmp626 fa726te
|
||||
#MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=fa526 *mthumb*/*mcpu=fa626
|
||||
|
||||
@@ -58,7 +58,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/arm/t-arm-elf gcc-4.6.3-arm/gcc/config/arm/t-ar
|
||||
#MULTILIB_EXCEPTIONS += *mcpu=fa526/*mfloat-abi=hard*
|
||||
#MULTILIB_EXCEPTIONS += *mcpu=fa626/*mfloat-abi=hard*
|
||||
|
||||
@@ -63,9 +85,9 @@
|
||||
@@ -49,9 +71,9 @@
|
||||
# MULTILIB_DIRNAMES += ep9312
|
||||
# MULTILIB_EXCEPTIONS += *mthumb/*mcpu=ep9312*
|
||||
#
|
||||
@@ -69,21 +69,21 @@ diff -Nbaur gcc-4.6.3/gcc/config/arm/t-arm-elf gcc-4.6.3-arm/gcc/config/arm/t-ar
|
||||
+MULTILIB_DIRNAMES += le be
|
||||
+MULTILIB_MATCHES += mbig-endian=mbe mlittle-endian=mle
|
||||
#
|
||||
# MULTILIB_OPTIONS += mhard-float/msoft-float
|
||||
# MULTILIB_OPTIONS += mfloat-abi=hard/mfloat-abi=soft
|
||||
# MULTILIB_DIRNAMES += fpu soft
|
||||
diff -Nbaur gcc-4.6.3/gcc/config/arm/unknown-elf.h gcc-4.6.3-arm/gcc/config/arm/unknown-elf.h
|
||||
--- gcc-4.6.3/gcc/config/arm/unknown-elf.h 2011-01-03 20:52:22.000000000 +0000
|
||||
+++ gcc-4.6.3-arm/gcc/config/arm/unknown-elf.h 2012-03-05 11:07:22.000000000 +0000
|
||||
@@ -97,4 +97,4 @@
|
||||
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-03-23 14:17:25.000000000 +0000
|
||||
@@ -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.6.3/gcc/gcc.c gcc-4.6.3-arm/gcc/gcc.c
|
||||
--- gcc-4.6.3/gcc/gcc.c 2011-02-23 02:04:43.000000000 +0000
|
||||
+++ gcc-4.6.3-arm/gcc/gcc.c 2012-03-05 11:07:22.000000000 +0000
|
||||
@@ -547,6 +547,11 @@
|
||||
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-03-23 14:17:25.000000000 +0000
|
||||
@@ -548,6 +548,11 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -95,7 +95,7 @@ diff -Nbaur gcc-4.6.3/gcc/gcc.c gcc-4.6.3-arm/gcc/gcc.c
|
||||
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
||||
#ifndef STARTFILE_SPEC
|
||||
#define STARTFILE_SPEC \
|
||||
@@ -702,6 +707,7 @@
|
||||
@@ -717,6 +722,7 @@
|
||||
static const char *mflib_spec = MFLIB_SPEC;
|
||||
static const char *link_gomp_spec = "";
|
||||
static const char *libgcc_spec = LIBGCC_SPEC;
|
||||
@@ -103,7 +103,7 @@ diff -Nbaur gcc-4.6.3/gcc/gcc.c gcc-4.6.3-arm/gcc/gcc.c
|
||||
static const char *endfile_spec = ENDFILE_SPEC;
|
||||
static const char *startfile_spec = STARTFILE_SPEC;
|
||||
static const char *linker_name_spec = LINKER_NAME;
|
||||
@@ -1180,6 +1186,7 @@
|
||||
@@ -1201,6 +1207,7 @@
|
||||
INIT_STATIC_SPEC ("mflib", &mflib_spec),
|
||||
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
||||
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
||||
@@ -111,26 +111,10 @@ diff -Nbaur gcc-4.6.3/gcc/gcc.c gcc-4.6.3-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.6.3/gcc/sched-deps.c gcc-4.6.3-arm/gcc/sched-deps.c
|
||||
--- gcc-4.6.3/gcc/sched-deps.c 2011-12-08 13:33:58.000000000 +0000
|
||||
+++ gcc-4.6.3-arm/gcc/sched-deps.c 2012-03-05 11:07:22.000000000 +0000
|
||||
@@ -2271,6 +2271,12 @@
|
||||
FIRST_STACK_REG + nregs);
|
||||
}
|
||||
#endif
|
||||
+
|
||||
+ /* If the stack pointer is being modified, flush out all memory
|
||||
+ references as they may become invalid if moved across the
|
||||
+ stack adjustment. */
|
||||
+ if (dest == stack_pointer_rtx)
|
||||
+ flush_pending_lists (deps, insn, true, true);
|
||||
}
|
||||
else if (MEM_P (dest))
|
||||
{
|
||||
diff -Nbaur gcc-4.6.3/libcpp/Makefile.in gcc-4.6.3-arm/libcpp/Makefile.in
|
||||
--- gcc-4.6.3/libcpp/Makefile.in 2012-03-01 12:03:46.000000000 +0000
|
||||
+++ gcc-4.6.3-arm/libcpp/Makefile.in 2012-03-05 11:07:22.000000000 +0000
|
||||
@@ -212,8 +212,7 @@
|
||||
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-03-23 14:17:25.000000000 +0000
|
||||
@@ -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.
|
||||
@@ -140,27 +124,27 @@ diff -Nbaur gcc-4.6.3/libcpp/Makefile.in gcc-4.6.3-arm/libcpp/Makefile.in
|
||||
else
|
||||
COMPILE = source='$<' object='$@' libtool=no DEPDIR=$(DEPDIR) $(DEPMODE) \
|
||||
$(depcomp) $(COMPILE.base)
|
||||
diff -Nbaur gcc-4.6.3/libgcc/Makefile.in gcc-4.6.3-arm/libgcc/Makefile.in
|
||||
--- gcc-4.6.3/libgcc/Makefile.in 2011-01-26 04:19:58.000000000 +0000
|
||||
+++ gcc-4.6.3-arm/libgcc/Makefile.in 2012-03-05 11:07:22.000000000 +0000
|
||||
@@ -411,14 +411,14 @@
|
||||
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-03-23 14:20:39.000000000 +0000
|
||||
@@ -500,14 +500,14 @@
|
||||
lib2-divmod-o = $(patsubst %,%$(objext),$(LIB2_DIVMOD_FUNCS))
|
||||
$(lib2-divmod-o): %$(objext): $(gcc_srcdir)/libgcc2.c
|
||||
$(gcc_compile) -DL$* -c $(gcc_srcdir)/libgcc2.c \
|
||||
$(lib2-divmod-o): %$(objext): $(srcdir)/libgcc2.c
|
||||
$(gcc_compile) -DL$* -c $< \
|
||||
- -fexceptions -fnon-call-exceptions $(vis_hide)
|
||||
+ -fno-exceptions -fno-non-call-exceptions $(vis_hide)
|
||||
+ -fno-exceptions -fnon-call-exceptions $(vis_hide)
|
||||
libgcc-objects += $(lib2-divmod-o)
|
||||
|
||||
ifeq ($(enable_shared),yes)
|
||||
lib2-divmod-s-o = $(patsubst %,%_s$(objext),$(LIB2_DIVMOD_FUNCS))
|
||||
$(lib2-divmod-s-o): %_s$(objext): $(gcc_srcdir)/libgcc2.c
|
||||
$(gcc_s_compile) -DL$* -c $(gcc_srcdir)/libgcc2.c \
|
||||
$(lib2-divmod-s-o): %_s$(objext): $(srcdir)/libgcc2.c
|
||||
$(gcc_s_compile) -DL$* -c $< \
|
||||
- -fexceptions -fnon-call-exceptions
|
||||
+ -fno-exceptions -fno-non-call-exceptions
|
||||
+ -fno-exceptions -fnon-call-exceptions
|
||||
libgcc-s-objects += $(lib2-divmod-s-o)
|
||||
endif
|
||||
|
||||
@@ -706,7 +706,7 @@
|
||||
@@ -810,7 +810,7 @@
|
||||
# libgcc_eh.a, only LIB2ADDEH matters. If we do, only LIB2ADDEHSTATIC and
|
||||
# LIB2ADDEHSHARED matter. (Usually all three are identical.)
|
||||
|
||||
@@ -169,12 +153,55 @@ diff -Nbaur gcc-4.6.3/libgcc/Makefile.in gcc-4.6.3-arm/libgcc/Makefile.in
|
||||
|
||||
ifeq ($(enable_shared),yes)
|
||||
|
||||
@@ -728,7 +728,7 @@
|
||||
|
||||
# Build LIBUNWIND.
|
||||
|
||||
-c_flags := -fexceptions
|
||||
+c_flags := -fno-exceptions
|
||||
|
||||
libunwind-objects += $(addsuffix $(objext),$(basename $(notdir $(LIBUNWIND))))
|
||||
|
||||
diff -Nbaur gcc-4.7.0/libgcc/Makefile.in.rej gcc-4.7.0-arm/libgcc/Makefile.in.rej
|
||||
--- gcc-4.7.0/libgcc/Makefile.in.rej 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ gcc-4.7.0-arm/libgcc/Makefile.in.rej 2012-03-23 14:17:25.000000000 +0000
|
||||
@@ -0,0 +1,48 @@
|
||||
+***************
|
||||
+*** 411,424 ****
|
||||
+ lib2-divmod-o = $(patsubst %,%$(objext),$(LIB2_DIVMOD_FUNCS))
|
||||
+ $(lib2-divmod-o): %$(objext): $(gcc_srcdir)/libgcc2.c
|
||||
+ $(gcc_compile) -DL$* -c $(gcc_srcdir)/libgcc2.c \
|
||||
+- -fexceptions -fnon-call-exceptions $(vis_hide)
|
||||
+ libgcc-objects += $(lib2-divmod-o)
|
||||
+
|
||||
+ ifeq ($(enable_shared),yes)
|
||||
+ lib2-divmod-s-o = $(patsubst %,%_s$(objext),$(LIB2_DIVMOD_FUNCS))
|
||||
+ $(lib2-divmod-s-o): %_s$(objext): $(gcc_srcdir)/libgcc2.c
|
||||
+ $(gcc_s_compile) -DL$* -c $(gcc_srcdir)/libgcc2.c \
|
||||
+- -fexceptions -fnon-call-exceptions
|
||||
+ libgcc-s-objects += $(lib2-divmod-s-o)
|
||||
+ endif
|
||||
+
|
||||
+--- 411,424 ----
|
||||
+ lib2-divmod-o = $(patsubst %,%$(objext),$(LIB2_DIVMOD_FUNCS))
|
||||
+ $(lib2-divmod-o): %$(objext): $(gcc_srcdir)/libgcc2.c
|
||||
+ $(gcc_compile) -DL$* -c $(gcc_srcdir)/libgcc2.c \
|
||||
++ -fno-exceptions -fno-non-call-exceptions $(vis_hide)
|
||||
+ libgcc-objects += $(lib2-divmod-o)
|
||||
+
|
||||
+ ifeq ($(enable_shared),yes)
|
||||
+ lib2-divmod-s-o = $(patsubst %,%_s$(objext),$(LIB2_DIVMOD_FUNCS))
|
||||
+ $(lib2-divmod-s-o): %_s$(objext): $(gcc_srcdir)/libgcc2.c
|
||||
+ $(gcc_s_compile) -DL$* -c $(gcc_srcdir)/libgcc2.c \
|
||||
++ -fno-exceptions -fno-non-call-exceptions
|
||||
+ libgcc-s-objects += $(lib2-divmod-s-o)
|
||||
+ endif
|
||||
+
|
||||
+***************
|
||||
+*** 832,838 ****
|
||||
+
|
||||
+ # Build LIBUNWIND.
|
||||
+
|
||||
+- c_flags := -fexceptions
|
||||
+
|
||||
+ libunwind-objects += $(addsuffix $(objext),$(basename $(notdir $(LIBUNWIND))))
|
||||
+
|
||||
+--- 832,838 ----
|
||||
+
|
||||
+ # Build LIBUNWIND.
|
||||
+
|
||||
++ c_flags := -fno-exceptions
|
||||
+
|
||||
+ libunwind-objects += $(addsuffix $(objext),$(basename $(notdir $(LIBUNWIND))))
|
||||
+
|
||||
Reference in New Issue
Block a user