From c34ecdd92fba3ec2fbe63bb6598b8aced3b077b7 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Sat, 10 Dec 2016 14:02:32 +0000 Subject: [PATCH] remove old patches --- dkarm-eabi/patches/gcc-5.3.0.patch | 147 ----------------------------- dkarm-eabi/patches/gcc-6.1.0.patch | 147 ----------------------------- 2 files changed, 294 deletions(-) delete mode 100644 dkarm-eabi/patches/gcc-5.3.0.patch delete mode 100644 dkarm-eabi/patches/gcc-6.1.0.patch diff --git a/dkarm-eabi/patches/gcc-5.3.0.patch b/dkarm-eabi/patches/gcc-5.3.0.patch deleted file mode 100644 index a1dd52e..0000000 --- a/dkarm-eabi/patches/gcc-5.3.0.patch +++ /dev/null @@ -1,147 +0,0 @@ -diff -Nbaur gcc-5.2.0/gcc/config/arm/t-arm-elf gcc-5.2.0-arm/gcc/config/arm/t-arm-elf ---- gcc-5.2.0/gcc/config/arm/t-arm-elf 2015-01-05 12:33:28.000000000 +0000 -+++ gcc-5.2.0-arm/gcc/config/arm/t-arm-elf 2015-11-23 20:16:26.736000000 +0000 -@@ -16,11 +16,19 @@ - # along with GCC; see the file COPYING3. If not see - # . - --MULTILIB_OPTIONS = marm/mthumb --MULTILIB_DIRNAMES = arm thumb -+MULTILIB_OPTIONS = mthumb march=armv6k mfloat-abi=hard -+MULTILIB_DIRNAMES = thumb armv6k fpu - MULTILIB_EXCEPTIONS = - MULTILIB_MATCHES = - -+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 +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). --MULTILIB_OPTIONS += mfloat-abi=hard --MULTILIB_DIRNAMES += fpu --MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard* -+#MULTILIB_OPTIONS += mfloat-abi=hard -+#MULTILIB_DIRNAMES += fpu -+#MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard* - #MULTILIB_EXCEPTIONS += *mcpu=fa526/*mfloat-abi=hard* - #MULTILIB_EXCEPTIONS += *mcpu=fa626/*mfloat-abi=hard* - -diff -Nbaur gcc-5.2.0/gcc/config/arm/unknown-elf.h gcc-5.2.0-arm/gcc/config/arm/unknown-elf.h ---- gcc-5.2.0/gcc/config/arm/unknown-elf.h 2015-11-28 18:13:20.576000000 +0000 -+++ gcc-5.2.0-arm/gcc/config/arm/unknown-elf.h 2015-11-28 18:14:06.328000000 +0000 -@@ -29,7 +29,7 @@ - #endif - - /* Now we define the strings used to build the spec file. */ --#define UNKNOWN_ELF_STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s" -+#define UNKNOWN_ELF_STARTFILE_SPEC " crti%O%s crtbegin%O%s" - - #undef STARTFILE_SPEC - #define STARTFILE_SPEC UNKNOWN_ELF_STARTFILE_SPEC -@@ -93,4 +93,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-5.2.0/gcc/gcc.c gcc-5.2.0-arm/gcc/gcc.c ---- gcc-5.2.0/gcc/gcc.c 2015-03-10 09:37:41.000000000 +0000 -+++ gcc-5.2.0-arm/gcc/gcc.c 2015-11-23 20:16:26.740000000 +0000 -@@ -647,6 +647,11 @@ - #endif - #endif - -+#ifndef LIBGLOSS_SPEC -+# define LIBGLOSS_SPEC "-lsysbase" -+#endif -+ -+ - /* config.h can define STARTFILE_SPEC to override the default crt0 files. */ - #ifndef STARTFILE_SPEC - #define STARTFILE_SPEC \ -@@ -879,6 +884,7 @@ - static const char *lib_spec = LIB_SPEC; - static const char *link_gomp_spec = ""; - static const char *libgcc_spec = LIBGCC_SPEC; -+static const char *libgloss_spec = LIBGLOSS_SPEC; - static const char *endfile_spec = ENDFILE_SPEC; - static const char *startfile_spec = STARTFILE_SPEC; - static const char *linker_name_spec = LINKER_NAME; -@@ -1374,6 +1380,7 @@ - INIT_STATIC_SPEC ("lib", &lib_spec), - INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec), - INIT_STATIC_SPEC ("libgcc", &libgcc_spec), -+ INIT_STATIC_SPEC ("libgloss", &libgloss_spec), - INIT_STATIC_SPEC ("startfile", &startfile_spec), - INIT_STATIC_SPEC ("cross_compile", &cross_compile), - INIT_STATIC_SPEC ("version", &compiler_version), -diff -Nbaur gcc-5.2.0/gcc/Makefile.in gcc-5.2.0-arm/gcc/Makefile.in ---- gcc-5.2.0/gcc/Makefile.in 2015-05-04 11:46:32.000000000 +0100 -+++ gcc-5.2.0-arm/gcc/Makefile.in 2015-11-23 20:16:26.744000000 +0000 -@@ -1053,8 +1053,8 @@ - # things like the go/%.o rule work properly; but we use $(*F) for the - # file part, as we just want the file part of the stem, not the entire - # file name. --COMPILE = $(COMPILE.base) -MT $@ -MMD -MP -MF $(@D)/$(DEPDIR)/$(*F).TPo --POSTCOMPILE = @mv $(@D)/$(DEPDIR)/$(*F).TPo $(@D)/$(DEPDIR)/$(*F).Po -+COMPILE = $(COMPILE.base) -+POSTCOMPILE = - else - COMPILE = source='$<' object='$@' libtool=no \ - DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) $(COMPILE.base) -diff -Nbaur gcc-5.2.0/libcpp/Makefile.in gcc-5.2.0-arm/libcpp/Makefile.in ---- gcc-5.2.0/libcpp/Makefile.in 2015-07-16 10:16:25.000000000 +0100 -+++ gcc-5.2.0-arm/libcpp/Makefile.in 2015-11-23 20:16:26.744000000 +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 - # not atomically write the dependency output file. --COMPILE = $(COMPILE.base) -o $@ -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Tpo --POSTCOMPILE = @mv $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+COMPILE = $(COMPILE.base) -o $@ - else - COMPILE = source='$<' object='$@' libtool=no DEPDIR=$(DEPDIR) $(DEPMODE) \ - $(depcomp) $(COMPILE.base) -diff -Nbaur gcc-5.2.0/libgcc/config/arm/t-bpabi gcc-5.2.0-arm/libgcc/config/arm/t-bpabi ---- gcc-5.2.0/libgcc/config/arm/t-bpabi 2012-08-17 16:06:06.000000000 +0100 -+++ gcc-5.2.0-arm/libgcc/config/arm/t-bpabi 2015-11-23 20:16:26.744000000 +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 - # the option is safe. --LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions -+LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions -diff -Nbaur gcc-5.2.0/libgcc/crtstuff.c gcc-5.2.0-arm/libgcc/crtstuff.c ---- gcc-5.2.0/libgcc/crtstuff.c 2015-01-05 12:33:28.000000000 +0000 -+++ gcc-5.2.0-arm/libgcc/crtstuff.c 2015-11-23 20:16:26.744000000 +0000 -@@ -47,7 +47,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-5.2.0/libgcc/Makefile.in gcc-5.2.0-arm/libgcc/Makefile.in ---- gcc-5.2.0/libgcc/Makefile.in 2015-01-29 08:03:56.000000000 +0000 -+++ gcc-5.2.0-arm/libgcc/Makefile.in 2015-11-23 20:16:26.744000000 +0000 -@@ -819,7 +819,7 @@ - # libgcc_eh.a, only LIB2ADDEH matters. If we do, only LIB2ADDEHSTATIC and - # LIB2ADDEHSHARED matter. (Usually all three are identical.) - --c_flags := -fexceptions -+c_flags := -fno-exceptions - - ifeq ($(enable_shared),yes) - diff --git a/dkarm-eabi/patches/gcc-6.1.0.patch b/dkarm-eabi/patches/gcc-6.1.0.patch deleted file mode 100644 index d1cbf0b..0000000 --- a/dkarm-eabi/patches/gcc-6.1.0.patch +++ /dev/null @@ -1,147 +0,0 @@ -diff -NBaur gcc-6.1.0/gcc/config/arm/t-arm-elf gcc-6.1.0-arm/gcc/config/arm/t-arm-elf ---- gcc-6.1.0/gcc/config/arm/t-arm-elf 2016-01-04 14:30:50.000000000 +0000 -+++ gcc-6.1.0-arm/gcc/config/arm/t-arm-elf 2016-05-13 15:01:12.997019640 +0100 -@@ -16,11 +16,19 @@ - # along with GCC; see the file COPYING3. If not see - # . - --MULTILIB_OPTIONS = marm/mthumb --MULTILIB_DIRNAMES = arm thumb -+MULTILIB_OPTIONS = mthumb march=armv6k mfloat-abi=hard -+MULTILIB_DIRNAMES = thumb armv6k fpu - MULTILIB_EXCEPTIONS = - MULTILIB_MATCHES = - -+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 +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). --MULTILIB_OPTIONS += mfloat-abi=hard --MULTILIB_DIRNAMES += fpu --MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard* -+#MULTILIB_OPTIONS += mfloat-abi=hard -+#MULTILIB_DIRNAMES += fpu -+#MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard* - #MULTILIB_EXCEPTIONS += *mcpu=fa526/*mfloat-abi=hard* - #MULTILIB_EXCEPTIONS += *mcpu=fa626/*mfloat-abi=hard* - -diff -NBaur gcc-6.1.0/gcc/config/arm/unknown-elf.h gcc-6.1.0-arm/gcc/config/arm/unknown-elf.h ---- gcc-6.1.0/gcc/config/arm/unknown-elf.h 2016-01-04 14:30:50.000000000 +0000 -+++ gcc-6.1.0-arm/gcc/config/arm/unknown-elf.h 2016-05-13 15:01:12.997019640 +0100 -@@ -29,7 +29,7 @@ - #endif - - /* Now we define the strings used to build the spec file. */ --#define UNKNOWN_ELF_STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s" -+#define UNKNOWN_ELF_STARTFILE_SPEC " crti%O%s crtbegin%O%s" - - #undef STARTFILE_SPEC - #define STARTFILE_SPEC \ -@@ -97,4 +97,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-6.1.0/gcc/gcc.c gcc-6.1.0-arm/gcc/gcc.c ---- gcc-6.1.0/gcc/gcc.c 2016-02-19 22:18:38.000000000 +0000 -+++ gcc-6.1.0-arm/gcc/gcc.c 2016-05-13 15:01:13.001019640 +0100 -@@ -778,6 +778,11 @@ - #endif - #endif - -+#ifndef LIBGLOSS_SPEC -+# define LIBGLOSS_SPEC "-lsysbase" -+#endif -+ -+ - /* config.h can define STARTFILE_SPEC to override the default crt0 files. */ - #ifndef STARTFILE_SPEC - #define STARTFILE_SPEC \ -@@ -1062,6 +1067,7 @@ - static const char *lib_spec = LIB_SPEC; - static const char *link_gomp_spec = ""; - static const char *libgcc_spec = LIBGCC_SPEC; -+static const char *libgloss_spec = LIBGLOSS_SPEC; - static const char *endfile_spec = ENDFILE_SPEC; - static const char *startfile_spec = STARTFILE_SPEC; - static const char *linker_name_spec = LINKER_NAME; -@@ -1563,6 +1569,7 @@ - INIT_STATIC_SPEC ("lib", &lib_spec), - INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec), - INIT_STATIC_SPEC ("libgcc", &libgcc_spec), -+ INIT_STATIC_SPEC ("libgloss", &libgloss_spec), - INIT_STATIC_SPEC ("startfile", &startfile_spec), - INIT_STATIC_SPEC ("cross_compile", &cross_compile), - INIT_STATIC_SPEC ("version", &compiler_version), -diff -NBaur gcc-6.1.0/gcc/Makefile.in gcc-6.1.0-arm/gcc/Makefile.in ---- gcc-6.1.0/gcc/Makefile.in 2016-04-15 12:49:39.000000000 +0100 -+++ gcc-6.1.0-arm/gcc/Makefile.in 2016-05-13 15:01:13.005019640 +0100 -@@ -1073,8 +1073,8 @@ - # things like the go/%.o rule work properly; but we use $(*F) for the - # file part, as we just want the file part of the stem, not the entire - # file name. --COMPILE = $(COMPILE.base) -MT $@ -MMD -MP -MF $(@D)/$(DEPDIR)/$(*F).TPo --POSTCOMPILE = @mv $(@D)/$(DEPDIR)/$(*F).TPo $(@D)/$(DEPDIR)/$(*F).Po -+COMPILE = $(COMPILE.base) -+POSTCOMPILE = - else - COMPILE = source='$<' object='$@' libtool=no \ - DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) $(COMPILE.base) -diff -NBaur gcc-6.1.0/libcpp/Makefile.in gcc-6.1.0-arm/libcpp/Makefile.in ---- gcc-6.1.0/libcpp/Makefile.in 2016-04-27 09:22:11.000000000 +0100 -+++ gcc-6.1.0-arm/libcpp/Makefile.in 2016-05-13 15:01:13.005019640 +0100 -@@ -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 - # not atomically write the dependency output file. --COMPILE = $(COMPILE.base) -o $@ -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Tpo --POSTCOMPILE = @mv $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+COMPILE = $(COMPILE.base) -o $@ - else - COMPILE = source='$<' object='$@' libtool=no DEPDIR=$(DEPDIR) $(DEPMODE) \ - $(depcomp) $(COMPILE.base) -diff -NBaur gcc-6.1.0/libgcc/config/arm/t-bpabi gcc-6.1.0-arm/libgcc/config/arm/t-bpabi ---- gcc-6.1.0/libgcc/config/arm/t-bpabi 2012-08-17 16:06:06.000000000 +0100 -+++ gcc-6.1.0-arm/libgcc/config/arm/t-bpabi 2016-05-13 15:01:13.005019640 +0100 -@@ -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 - # the option is safe. --LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions -+LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions -diff -NBaur gcc-6.1.0/libgcc/crtstuff.c gcc-6.1.0-arm/libgcc/crtstuff.c ---- gcc-6.1.0/libgcc/crtstuff.c 2016-01-04 14:30:50.000000000 +0000 -+++ gcc-6.1.0-arm/libgcc/crtstuff.c 2016-05-13 15:01:13.009019640 +0100 -@@ -47,7 +47,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-6.1.0/libgcc/Makefile.in gcc-6.1.0-arm/libgcc/Makefile.in ---- gcc-6.1.0/libgcc/Makefile.in 2016-02-25 12:23:52.000000000 +0000 -+++ gcc-6.1.0-arm/libgcc/Makefile.in 2016-05-13 15:01:13.009019640 +0100 -@@ -820,7 +820,7 @@ - # libgcc_eh.a, only LIB2ADDEH matters. If we do, only LIB2ADDEHSTATIC and - # LIB2ADDEHSHARED matter. (Usually all three are identical.) - --c_flags := -fexceptions -+c_flags := -fno-exceptions - - ifeq ($(enable_shared),yes) -