Leahnaya/buildscripts
1
0
Fork 0
mirror of https://github.com/devkitPro/buildscripts.git synced 2026-04-26 08:15:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

minor fix for cross compiling

Browse Source
This commit is contained in:
Dave Murphy 2012-04-05 21:56:24 +01:00
parent 611ef56c5f
commit 1da34ba8aa
2 changed files with 34 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
dkarm-eabi/patches/gcc-4.7.0.patch
View File

@ -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 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/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 +++ gcc-4.7.0-arm/gcc/config/arm/t-arm-elf 2012-04-05 20:36:17.000000000 +0100
@@ -26,22 +26,44 @@ @@ -26,22 +26,44 @@
#MULTILIB_DIRNAMES += fa526 fa626 fa606te fa626te fmp626 fa726te #MULTILIB_DIRNAMES += fa526 fa626 fa606te fa626te fmp626 fa726te
#MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=fa526 *mthumb*/*mcpu=fa626 #MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=fa526 *mthumb*/*mcpu=fa626
@ -73,7 +73,7 @@ diff -Nbaur gcc-4.7.0/gcc/config/arm/t-arm-elf gcc-4.7.0-arm/gcc/config/arm/t-ar
# MULTILIB_DIRNAMES += fpu 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 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/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 +++ gcc-4.7.0-arm/gcc/config/arm/unknown-elf.h 2012-04-05 20:36:17.000000000 +0100
@@ -94,4 +94,4 @@ @@ -94,4 +94,4 @@
udivmoddi4, which will depend on the exception unwind routines, udivmoddi4, which will depend on the exception unwind routines,
which will depend on abort, which is defined in libc. */ which will depend on abort, which is defined in libc. */
@ -82,7 +82,7 @@ diff -Nbaur gcc-4.7.0/gcc/config/arm/unknown-elf.h gcc-4.7.0-arm/gcc/config/arm/
+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --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 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/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 +++ gcc-4.7.0-arm/gcc/gcc.c 2012-04-05 20:36:17.000000000 +0100
@@ -548,6 +548,11 @@ @@ -548,6 +548,11 @@
#endif #endif
#endif #endif
@ -113,7 +113,7 @@ diff -Nbaur gcc-4.7.0/gcc/gcc.c gcc-4.7.0-arm/gcc/gcc.c
INIT_STATIC_SPEC ("version", &compiler_version), INIT_STATIC_SPEC ("version", &compiler_version),
diff -Nbaur gcc-4.7.0/libcpp/Makefile.in gcc-4.7.0-arm/libcpp/Makefile.in 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/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 +++ gcc-4.7.0-arm/libcpp/Makefile.in 2012-04-05 20:36:17.000000000 +0100
@@ -214,8 +214,7 @@ @@ -214,8 +214,7 @@
# Note that we put the dependencies into a .Tpo file, then move them # 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 # into place if the compile succeeds. We need this because gcc does
@ -124,9 +124,21 @@ diff -Nbaur gcc-4.7.0/libcpp/Makefile.in gcc-4.7.0-arm/libcpp/Makefile.in
else else
COMPILE = source='$<' object='$@' libtool=no DEPDIR=$(DEPDIR) $(DEPMODE) \ COMPILE = source='$<' object='$@' libtool=no DEPDIR=$(DEPDIR) $(DEPMODE) \
$(depcomp) $(COMPILE.base) $(depcomp) $(COMPILE.base)
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-05 20:36:50.000000000 +0100
@@ -49,7 +49,7 @@
/* Target machine header files require this define. */
#define IN_LIBGCC2
-
+#define USED_FOR_TARGET
/* FIXME: Including auto-host is incorrect, but until we have
identified the set of defines that need to go into auto-target.h,
this will have to do. */
diff -Nbaur gcc-4.7.0/libgcc/Makefile.in gcc-4.7.0-arm/libgcc/Makefile.in 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/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 +++ gcc-4.7.0-arm/libgcc/Makefile.in 2012-04-05 20:36:17.000000000 +0100
@@ -500,14 +500,14 @@ @@ -500,14 +500,14 @@
lib2-divmod-o = $(patsubst %,%$(objext),$(LIB2_DIVMOD_FUNCS)) lib2-divmod-o = $(patsubst %,%$(objext),$(LIB2_DIVMOD_FUNCS))
$(lib2-divmod-o): %$(objext): $(srcdir)/libgcc2.c $(lib2-divmod-o): %$(objext): $(srcdir)/libgcc2.c
@ -153,55 +165,3 @@ diff -Nbaur gcc-4.7.0/libgcc/Makefile.in gcc-4.7.0-arm/libgcc/Makefile.in
ifeq ($(enable_shared),yes) ifeq ($(enable_shared),yes)
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))))
+

22
dkppc/patches/gcc-4.7.0.patch
View File

@ -1,6 +1,6 @@
diff -Nbaur gcc-4.7.0/gcc/config/rs6000/rs6000.h gcc-4.7.0-ppc/gcc/config/rs6000/rs6000.h diff -Nbaur gcc-4.7.0/gcc/config/rs6000/rs6000.h gcc-4.7.0-ppc/gcc/config/rs6000/rs6000.h
--- gcc-4.7.0/gcc/config/rs6000/rs6000.h 2011-11-29 17:33:05.000000000 +0000 --- gcc-4.7.0/gcc/config/rs6000/rs6000.h 2011-11-29 17:33:05.000000000 +0000
+++ gcc-4.7.0-ppc/gcc/config/rs6000/rs6000.h 2012-03-23 15:09:12.000000000 +0000 +++ gcc-4.7.0-ppc/gcc/config/rs6000/rs6000.h 2012-04-05 20:59:16.000000000 +0100
@@ -200,6 +200,7 @@ @@ -200,6 +200,7 @@
{ "asm_cpu_476", ASM_CPU_476_SPEC }, \ { "asm_cpu_476", ASM_CPU_476_SPEC }, \
SUBTARGET_EXTRA_SPECS SUBTARGET_EXTRA_SPECS
@ -20,7 +20,7 @@ diff -Nbaur gcc-4.7.0/gcc/config/rs6000/rs6000.h gcc-4.7.0-ppc/gcc/config/rs6000
#ifdef HAVE_LOCAL_CPU_DETECT #ifdef HAVE_LOCAL_CPU_DETECT
diff -Nbaur gcc-4.7.0/gcc/config/rs6000/sysv4.h gcc-4.7.0-ppc/gcc/config/rs6000/sysv4.h diff -Nbaur gcc-4.7.0/gcc/config/rs6000/sysv4.h gcc-4.7.0-ppc/gcc/config/rs6000/sysv4.h
--- gcc-4.7.0/gcc/config/rs6000/sysv4.h 2011-04-11 19:46:05.000000000 +0100 --- gcc-4.7.0/gcc/config/rs6000/sysv4.h 2011-04-11 19:46:05.000000000 +0100
+++ gcc-4.7.0-ppc/gcc/config/rs6000/sysv4.h 2012-03-23 15:09:12.000000000 +0000 +++ gcc-4.7.0-ppc/gcc/config/rs6000/sysv4.h 2012-04-05 20:59:16.000000000 +0100
@@ -594,7 +594,11 @@ @@ -594,7 +594,11 @@
/* Default starting address if specified. */ /* Default starting address if specified. */
@ -182,7 +182,7 @@ diff -Nbaur gcc-4.7.0/gcc/config/rs6000/sysv4.h gcc-4.7.0-ppc/gcc/config/rs6000/
{ "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
diff -Nbaur gcc-4.7.0/gcc/config/rs6000/sysv4.opt gcc-4.7.0-ppc/gcc/config/rs6000/sysv4.opt diff -Nbaur gcc-4.7.0/gcc/config/rs6000/sysv4.opt gcc-4.7.0-ppc/gcc/config/rs6000/sysv4.opt
--- gcc-4.7.0/gcc/config/rs6000/sysv4.opt 2011-05-05 15:59:55.000000000 +0100 --- gcc-4.7.0/gcc/config/rs6000/sysv4.opt 2011-05-05 15:59:55.000000000 +0100
+++ gcc-4.7.0-ppc/gcc/config/rs6000/sysv4.opt 2012-03-23 15:09:12.000000000 +0000 +++ gcc-4.7.0-ppc/gcc/config/rs6000/sysv4.opt 2012-04-05 20:59:16.000000000 +0100
@@ -121,6 +121,26 @@ @@ -121,6 +121,26 @@
Target RejectNegative Target RejectNegative
Link with libads.a, libc.a and crt0.o Link with libads.a, libc.a and crt0.o
@ -212,7 +212,7 @@ diff -Nbaur gcc-4.7.0/gcc/config/rs6000/sysv4.opt gcc-4.7.0-ppc/gcc/config/rs600
Link with libyk.a, libc.a and crt0.o Link with libyk.a, libc.a and crt0.o
diff -Nbaur gcc-4.7.0/gcc/config.gcc gcc-4.7.0-ppc/gcc/config.gcc diff -Nbaur gcc-4.7.0/gcc/config.gcc gcc-4.7.0-ppc/gcc/config.gcc
--- gcc-4.7.0/gcc/config.gcc 2012-03-05 10:43:22.000000000 +0000 --- gcc-4.7.0/gcc/config.gcc 2012-03-05 10:43:22.000000000 +0000
+++ gcc-4.7.0-ppc/gcc/config.gcc 2012-03-23 15:09:12.000000000 +0000 +++ gcc-4.7.0-ppc/gcc/config.gcc 2012-04-05 20:59:17.000000000 +0100
@@ -1999,7 +1999,7 @@ @@ -1999,7 +1999,7 @@
use_gcc_stdint=wrap use_gcc_stdint=wrap
;; ;;
@ -224,7 +224,7 @@ diff -Nbaur gcc-4.7.0/gcc/config.gcc gcc-4.7.0-ppc/gcc/config.gcc
use_gcc_stdint=wrap use_gcc_stdint=wrap
diff -Nbaur gcc-4.7.0/libcpp/Makefile.in gcc-4.7.0-ppc/libcpp/Makefile.in diff -Nbaur gcc-4.7.0/libcpp/Makefile.in gcc-4.7.0-ppc/libcpp/Makefile.in
--- gcc-4.7.0/libcpp/Makefile.in 2012-03-22 07:37:39.000000000 +0000 --- gcc-4.7.0/libcpp/Makefile.in 2012-03-22 07:37:39.000000000 +0000
+++ gcc-4.7.0-ppc/libcpp/Makefile.in 2012-03-23 15:09:12.000000000 +0000 +++ gcc-4.7.0-ppc/libcpp/Makefile.in 2012-04-05 20:59:17.000000000 +0100
@@ -214,8 +214,7 @@ @@ -214,8 +214,7 @@
# Note that we put the dependencies into a .Tpo file, then move them # 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 # into place if the compile succeeds. We need this because gcc does
@ -235,3 +235,15 @@ diff -Nbaur gcc-4.7.0/libcpp/Makefile.in gcc-4.7.0-ppc/libcpp/Makefile.in
else else
COMPILE = source='$<' object='$@' libtool=no DEPDIR=$(DEPDIR) $(DEPMODE) \ COMPILE = source='$<' object='$@' libtool=no DEPDIR=$(DEPDIR) $(DEPMODE) \
$(depcomp) $(COMPILE.base) $(depcomp) $(COMPILE.base)
diff -Nbaur gcc-4.7.0/libgcc/crtstuff.c gcc-4.7.0-ppc/libgcc/crtstuff.c
--- gcc-4.7.0/libgcc/crtstuff.c 2011-12-06 21:35:41.000000000 +0000
+++ gcc-4.7.0-ppc/libgcc/crtstuff.c 2012-04-05 20:59:46.000000000 +0100
@@ -49,7 +49,7 @@
/* Target machine header files require this define. */
#define IN_LIBGCC2
-
+#define USED_FOR_TARGET
/* FIXME: Including auto-host is incorrect, but until we have
identified the set of defines that need to go into auto-target.h,
this will have to do. */