From 9c53de7304661b90bb326a8454f458db8bf4032b Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Fri, 28 Nov 2014 23:11:50 +0000 Subject: [PATCH] correct multilib setup --- dkarm-eabi/patches/gcc-4.9.2.patch | 33 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dkarm-eabi/patches/gcc-4.9.2.patch b/dkarm-eabi/patches/gcc-4.9.2.patch index 5a87a6f..6da66c8 100644 --- a/dkarm-eabi/patches/gcc-4.9.2.patch +++ b/dkarm-eabi/patches/gcc-4.9.2.patch @@ -1,27 +1,28 @@ diff -NBaur gcc-4.9.2/gcc/config/arm/t-arm-elf gcc-4.9.2-arm/gcc/config/arm/t-arm-elf --- gcc-4.9.2/gcc/config/arm/t-arm-elf 2014-01-02 22:23:26.000000000 +0000 -+++ gcc-4.9.2-arm/gcc/config/arm/t-arm-elf 2014-11-25 15:04:06.310756001 +0000 -@@ -16,11 +16,17 @@ ++++ gcc-4.9.2-arm/gcc/config/arm/t-arm-elf 2014-11-28 23:00:35.274756000 +0000 +@@ -16,10 +16,18 @@ # along with GCC; see the file COPYING3. If not see # . -MULTILIB_OPTIONS = marm/mthumb -MULTILIB_DIRNAMES = arm thumb -+MULTILIB_OPTIONS = marm/mthumb/march=armv6k -+MULTILIB_DIRNAMES = arm thumb armv6k ++MULTILIB_OPTIONS = mthumb march=armv6k mfloat-abi=hard ++MULTILIB_DIRNAMES = thumb armv6k fpu MULTILIB_EXCEPTIONS = MULTILIB_MATCHES = - -+MULTILIB_OPTIONS += mfloat-abi=hard -+MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard* -+MULTILIB_EXCEPTIONS += *marm/*mfloat-abi=hard* ++ ++MULTILIB_REQUIRED = mthumb march=armv6k/mfloat-abi=hard ++ ++ +MULTILIB_MATCHES += march?armv6k=mtune?mpcore +MULTILIB_MATCHES += march?armv6k=mcpu?mpcore + ++ + #MULTILIB_OPTIONS += mcpu=fa526/mcpu=fa626/mcpu=fa606te/mcpu=fa626te/mcpu=fmp626/mcpu=fa726te #MULTILIB_DIRNAMES += fa526 fa626 fa606te fa626te fmp626 fa726te - #MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=fa526 *mthumb*/*mcpu=fa626 -@@ -38,9 +44,9 @@ +@@ -38,9 +46,9 @@ # Not quite true. We can support hard-vfp calling in Thumb2, but how do we # express that here? Also, we really need architecture v5e or later # (mcrr etc). @@ -36,7 +37,7 @@ diff -NBaur gcc-4.9.2/gcc/config/arm/t-arm-elf gcc-4.9.2-arm/gcc/config/arm/t-ar diff -NBaur gcc-4.9.2/gcc/config/arm/unknown-elf.h gcc-4.9.2-arm/gcc/config/arm/unknown-elf.h --- gcc-4.9.2/gcc/config/arm/unknown-elf.h 2014-01-02 22:23:26.000000000 +0000 -+++ gcc-4.9.2-arm/gcc/config/arm/unknown-elf.h 2014-11-20 10:47:00.204883000 +0000 ++++ gcc-4.9.2-arm/gcc/config/arm/unknown-elf.h 2014-11-28 23:00:10.914756000 +0000 @@ -93,4 +93,4 @@ udivmoddi4, which will depend on the exception unwind routines, which will depend on abort, which is defined in libc. */ @@ -45,7 +46,7 @@ diff -NBaur gcc-4.9.2/gcc/config/arm/unknown-elf.h gcc-4.9.2-arm/gcc/config/arm/ +#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group" diff -NBaur gcc-4.9.2/gcc/gcc.c gcc-4.9.2-arm/gcc/gcc.c --- gcc-4.9.2/gcc/gcc.c 2014-10-22 22:42:48.000000000 +0100 -+++ gcc-4.9.2-arm/gcc/gcc.c 2014-11-20 10:47:00.208883000 +0000 ++++ gcc-4.9.2-arm/gcc/gcc.c 2014-11-28 23:00:10.918756000 +0000 @@ -616,6 +616,11 @@ #endif #endif @@ -76,7 +77,7 @@ diff -NBaur gcc-4.9.2/gcc/gcc.c gcc-4.9.2-arm/gcc/gcc.c INIT_STATIC_SPEC ("version", &compiler_version), diff -NBaur gcc-4.9.2/libcpp/Makefile.in gcc-4.9.2-arm/libcpp/Makefile.in --- gcc-4.9.2/libcpp/Makefile.in 2014-10-30 08:28:58.000000000 +0000 -+++ gcc-4.9.2-arm/libcpp/Makefile.in 2014-11-20 10:47:00.212883000 +0000 ++++ gcc-4.9.2-arm/libcpp/Makefile.in 2014-11-28 23:00:10.922756000 +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 @@ -89,7 +90,7 @@ diff -NBaur gcc-4.9.2/libcpp/Makefile.in gcc-4.9.2-arm/libcpp/Makefile.in $(depcomp) $(COMPILE.base) diff -NBaur gcc-4.9.2/libgcc/config/arm/t-bpabi gcc-4.9.2-arm/libgcc/config/arm/t-bpabi --- gcc-4.9.2/libgcc/config/arm/t-bpabi 2012-08-17 16:06:06.000000000 +0100 -+++ gcc-4.9.2-arm/libgcc/config/arm/t-bpabi 2014-11-20 10:47:00.212883000 +0000 ++++ gcc-4.9.2-arm/libgcc/config/arm/t-bpabi 2014-11-28 23:00:10.922756000 +0000 @@ -17,4 +17,4 @@ # On ARM, specifying -fnon-call-exceptions will needlessly pull in # the unwinder in simple programs which use 64-bit division. Omitting @@ -98,7 +99,7 @@ diff -NBaur gcc-4.9.2/libgcc/config/arm/t-bpabi gcc-4.9.2-arm/libgcc/config/arm/ +LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions diff -NBaur gcc-4.9.2/libgcc/crtstuff.c gcc-4.9.2-arm/libgcc/crtstuff.c --- gcc-4.9.2/libgcc/crtstuff.c 2014-03-10 18:31:20.000000000 +0000 -+++ gcc-4.9.2-arm/libgcc/crtstuff.c 2014-11-20 10:47:00.212883000 +0000 ++++ gcc-4.9.2-arm/libgcc/crtstuff.c 2014-11-28 23:00:10.922756000 +0000 @@ -47,7 +47,7 @@ /* Target machine header files require this define. */ @@ -110,7 +111,7 @@ diff -NBaur gcc-4.9.2/libgcc/crtstuff.c gcc-4.9.2-arm/libgcc/crtstuff.c this will have to do. */ diff -NBaur gcc-4.9.2/libgcc/Makefile.in gcc-4.9.2-arm/libgcc/Makefile.in --- gcc-4.9.2/libgcc/Makefile.in 2014-01-08 16:37:08.000000000 +0000 -+++ gcc-4.9.2-arm/libgcc/Makefile.in 2014-11-20 10:47:00.216883000 +0000 ++++ gcc-4.9.2-arm/libgcc/Makefile.in 2014-11-28 23:00:10.922756000 +0000 @@ -816,7 +816,7 @@ # libgcc_eh.a, only LIB2ADDEH matters. If we do, only LIB2ADDEHSTATIC and # LIB2ADDEHSHARED matter. (Usually all three are identical.)