From 6176ff0dc44ee04a6cfaadbd8fa595552e8e1b5b Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 11 Sep 2008 15:53:10 +0000 Subject: Remove (unused). --- .../patches/binutils-2.18-rtems4.9-20080211.diff | 68 ------------ .../patches/gcc-core-4.3.1-rtems4.9-20080628.diff | 117 --------------------- 2 files changed, 185 deletions(-) delete mode 100644 contrib/crossrpms/patches/binutils-2.18-rtems4.9-20080211.diff delete mode 100644 contrib/crossrpms/patches/gcc-core-4.3.1-rtems4.9-20080628.diff (limited to 'contrib') diff --git a/contrib/crossrpms/patches/binutils-2.18-rtems4.9-20080211.diff b/contrib/crossrpms/patches/binutils-2.18-rtems4.9-20080211.diff deleted file mode 100644 index df54815012..0000000000 --- a/contrib/crossrpms/patches/binutils-2.18-rtems4.9-20080211.diff +++ /dev/null @@ -1,68 +0,0 @@ -diff -uNr binutils-2.18.orig/configure binutils-2.18/configure ---- binutils-2.18.orig/configure 2007-08-06 22:29:40.000000000 +0200 -+++ binutils-2.18/configure 2008-02-11 17:43:28.000000000 +0100 -@@ -6128,7 +6128,7 @@ - # For an installed makeinfo, we require it to be from texinfo 4.4 or - # higher, else we use the "missing" dummy. - if ${MAKEINFO} --version \ -- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then -+ | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then - : - else - MAKEINFO="$MISSING makeinfo" -diff -uNr binutils-2.18.orig/configure.ac binutils-2.18/configure.ac ---- binutils-2.18.orig/configure.ac 2007-08-28 22:24:26.000000000 +0200 -+++ binutils-2.18/configure.ac 2008-02-11 17:43:28.000000000 +0100 -@@ -2403,7 +2403,7 @@ - # For an installed makeinfo, we require it to be from texinfo 4.4 or - # higher, else we use the "missing" dummy. - if ${MAKEINFO} --version \ -- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then -+ | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then - : - else - MAKEINFO="$MISSING makeinfo" -diff -uNr binutils-2.18.orig/gas/config/tc-avr.c binutils-2.18/gas/config/tc-avr.c ---- binutils-2.18.orig/gas/config/tc-avr.c 2007-08-06 21:59:55.000000000 +0200 -+++ binutils-2.18/gas/config/tc-avr.c 2008-02-11 17:43:13.000000000 +0100 -@@ -63,7 +63,7 @@ - { - {"avr1", AVR_ISA_TINY1, bfd_mach_avr1}, - {"avr2", AVR_ISA_TINY2, bfd_mach_avr2}, -- {"avr3", AVR_ISA_M103, bfd_mach_avr3}, -+ {"avr3", AVR_ISA_AVR3, bfd_mach_avr3}, - {"avr4", AVR_ISA_M8, bfd_mach_avr4}, - {"avr5", AVR_ISA_ALL, bfd_mach_avr5}, - {"avr6", AVR_ISA_ALL, bfd_mach_avr6}, -@@ -102,6 +102,8 @@ - {"at43usb320", AVR_ISA_M103, bfd_mach_avr3}, - {"at43usb355", AVR_ISA_M603, bfd_mach_avr3}, - {"at76c711", AVR_ISA_M603, bfd_mach_avr3}, -+ {"at90usb82", AVR_ISA_USB162, bfd_mach_avr3}, -+ {"at90usb162", AVR_ISA_USB162, bfd_mach_avr3}, - {"atmega48", AVR_ISA_PWMx, bfd_mach_avr4}, - {"atmega8", AVR_ISA_M8, bfd_mach_avr4}, - {"atmega83", AVR_ISA_M8, bfd_mach_avr4}, /* XXX -> m8535 */ -@@ -150,8 +152,6 @@ - {"at90can32" , AVR_ISA_M323, bfd_mach_avr5}, - {"at90can64" , AVR_ISA_M323, bfd_mach_avr5}, - {"at90can128", AVR_ISA_M128, bfd_mach_avr5}, -- {"at90usb82", AVR_ISA_M323, bfd_mach_avr5}, -- {"at90usb162", AVR_ISA_M323, bfd_mach_avr5}, - {"at90usb646", AVR_ISA_M323, bfd_mach_avr5}, - {"at90usb647", AVR_ISA_M323, bfd_mach_avr5}, - {"at90usb1286",AVR_ISA_M128, bfd_mach_avr5}, -diff -uNr binutils-2.18.orig/include/opcode/avr.h binutils-2.18/include/opcode/avr.h ---- binutils-2.18.orig/include/opcode/avr.h 2006-04-07 17:18:08.000000000 +0200 -+++ binutils-2.18/include/opcode/avr.h 2008-02-11 17:43:13.000000000 +0100 -@@ -40,6 +40,10 @@ - AVR_ISA_LPMX | AVR_ISA_SPM) - #define AVR_ISA_M603 (AVR_ISA_2xxx | AVR_ISA_MEGA) - #define AVR_ISA_M103 (AVR_ISA_M603 | AVR_ISA_ELPM) -+#define AVR_ISA_USB162 (AVR_ISA_M603 | AVR_ISA_MOVW | \ -+ AVR_ISA_LPMX | AVR_ISA_SPM) -+#define AVR_ISA_AVR3 (AVR_ISA_M603 | AVR_ISA_MOVW | \ -+ AVR_ISA_LPMX | AVR_ISA_SPM | AVR_ISA_ELPM) - #define AVR_ISA_M161 (AVR_ISA_M603 | AVR_ISA_MUL | AVR_ISA_MOVW | \ - AVR_ISA_LPMX | AVR_ISA_SPM) - #define AVR_ISA_94K (AVR_ISA_M603 | AVR_ISA_MUL | AVR_ISA_MOVW | AVR_ISA_LPMX) diff --git a/contrib/crossrpms/patches/gcc-core-4.3.1-rtems4.9-20080628.diff b/contrib/crossrpms/patches/gcc-core-4.3.1-rtems4.9-20080628.diff deleted file mode 100644 index fbb09207ac..0000000000 --- a/contrib/crossrpms/patches/gcc-core-4.3.1-rtems4.9-20080628.diff +++ /dev/null @@ -1,117 +0,0 @@ -diff -Naur gcc-4.3.1.orig/configure gcc-4.3.1/configure ---- gcc-4.3.1.orig/configure 2008-02-02 04:29:30.000000000 +0100 -+++ gcc-4.3.1/configure 2008-06-28 05:54:55.000000000 +0200 -@@ -2185,6 +2185,7 @@ - noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap" - ;; - *-*-rtems*) -+ skipdirs="$skipdirs target-libiberty" - noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" - ;; - # The tpf target doesn't support gdb yet. -@@ -5829,7 +5830,7 @@ - # to it. This is right: we don't want to search that directory - # for binaries, but we want the header files in there, so add - # them explicitly. -- FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include' -+ FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include -isystem $$r/$(HOST_SUBDIR)/gcc/include-fixed' - - # Someone might think of using the pre-installed headers on - # Canadian crosses, in case the installed compiler is not fully -diff -Naur gcc-4.3.1.orig/configure.ac gcc-4.3.1/configure.ac ---- gcc-4.3.1.orig/configure.ac 2008-02-02 04:29:30.000000000 +0100 -+++ gcc-4.3.1/configure.ac 2008-06-28 05:54:55.000000000 +0200 -@@ -462,6 +462,7 @@ - noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap" - ;; - *-*-rtems*) -+ skipdirs="$skipdirs target-libiberty" - noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" - ;; - # The tpf target doesn't support gdb yet. -@@ -2340,7 +2341,7 @@ - # to it. This is right: we don't want to search that directory - # for binaries, but we want the header files in there, so add - # them explicitly. -- FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include' -+ FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include -isystem $$r/$(HOST_SUBDIR)/gcc/include-fixed' - - # Someone might think of using the pre-installed headers on - # Canadian crosses, in case the installed compiler is not fully -diff -Naur gcc-4.3.1.orig/gcc/config/m68k/t-rtems gcc-4.3.1/gcc/config/m68k/t-rtems ---- gcc-4.3.1.orig/gcc/config/m68k/t-rtems 2008-02-16 06:52:54.000000000 +0100 -+++ gcc-4.3.1/gcc/config/m68k/t-rtems 2008-06-28 05:55:58.000000000 +0200 -@@ -4,5 +4,6 @@ - || MLIB == "5206" \ - || MLIB == "5208" \ - || MLIB == "5307" \ -+ || MLIB == "5329" \ - || MLIB == "5407" \ - || MLIB == "5475") -diff -Naur gcc-4.3.1.orig/gcc/config/mips/elf.h gcc-4.3.1/gcc/config/mips/elf.h ---- gcc-4.3.1.orig/gcc/config/mips/elf.h 2007-08-02 12:49:31.000000000 +0200 -+++ gcc-4.3.1/gcc/config/mips/elf.h 2008-06-28 05:54:55.000000000 +0200 -@@ -48,6 +48,4 @@ - #undef ENDFILE_SPEC - #define ENDFILE_SPEC "crtend%O%s crtn%O%s" - --#define NO_IMPLICIT_EXTERN_C 1 -- - #define HANDLE_PRAGMA_PACK_PUSH_POP 1 -diff -Naur gcc-4.3.1.orig/gcc/config/rs6000/rtems.h gcc-4.3.1/gcc/config/rs6000/rtems.h ---- gcc-4.3.1.orig/gcc/config/rs6000/rtems.h 2007-08-02 12:49:31.000000000 +0200 -+++ gcc-4.3.1/gcc/config/rs6000/rtems.h 2008-06-28 05:54:55.000000000 +0200 -@@ -49,8 +49,18 @@ - %{mcpu=604: %{!Dppc*: %{!Dmpc*: -Dmpc604} } } \ - %{mcpu=750: %{!Dppc*: %{!Dmpc*: -Dmpc750} } } \ - %{mcpu=821: %{!Dppc*: %{!Dmpc*: -Dmpc821} } } \ --%{mcpu=860: %{!Dppc*: %{!Dmpc*: -Dmpc860} } }" -+%{mcpu=860: %{!Dppc*: %{!Dmpc*: -Dmpc860} } } \ -+%{mcpu=8540: %{!Dppc*: %{!Dmpc*: -Dppc8540} } }" - - #undef SUBSUBTARGET_EXTRA_SPECS - #define SUBSUBTARGET_EXTRA_SPECS \ - { "cpp_os_rtems", CPP_OS_RTEMS_SPEC } -+ -+#undef SUBSUBTARGET_OVERRIDE_OPTIONS -+#define SUBSUBTARGET_OVERRIDE_OPTIONS \ -+ do { \ -+ if (TARGET_E500) \ -+ { \ -+ rs6000_float_gprs = 1; \ -+ } \ -+ } while(0) -diff -Naur gcc-4.3.1.orig/gcc/config/rs6000/t-rtems gcc-4.3.1/gcc/config/rs6000/t-rtems ---- gcc-4.3.1.orig/gcc/config/rs6000/t-rtems 2005-05-27 09:54:06.000000000 +0200 -+++ gcc-4.3.1/gcc/config/rs6000/t-rtems 2008-06-28 05:54:55.000000000 +0200 -@@ -1,12 +1,12 @@ - # Multilibs for powerpc RTEMS targets. - - MULTILIB_OPTIONS = \ --mcpu=403/mcpu=505/mcpu=601/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400 \ -+mcpu=403/mcpu=505/mcpu=601/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400/mcpu=8540 \ - Dmpc8260 \ - msoft-float - - MULTILIB_DIRNAMES = \ --m403 m505 m601 m603e m604 m860 m7400 \ -+m403 m505 m601 m603e m604 m860 m7400 m8540 \ - mpc8260 \ - nof - -@@ -31,6 +31,10 @@ - # Map 750 to . - MULTILIB_MATCHES += mcpu?750= - -+# Map e500, 8548 to 8540 -+MULTILIB_MATCHES += mcpu?8540=mcpu?e500 -+MUTLILIB_MATCHES += mcpu?8540=mcpu?8548 -+ - # Soft-float only, default implies msoft-float - # NOTE: Must match with MULTILIB_MATCHES_FLOAT and MULTILIB_MATCHES - MULTILIB_SOFTFLOAT_ONLY = \ -@@ -64,3 +68,4 @@ - MULTILIB_EXCEPTIONS += *mcpu=750/Dmpc* - MULTILIB_EXCEPTIONS += *mcpu=860/Dmpc* - MULTILIB_EXCEPTIONS += *mcpu=7400/Dmpc* -+MULTILIB_EXCEPTIONS += *mcpu=8540/Dmpc* -- cgit v1.2.3