From fceebb8d90023eddd567659f385faba80242ac7a Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 13 May 2011 16:25:44 +0000 Subject: Housekeeping. --- .../patches/gcc-core-4.5.2-rtems4.11-20101216.diff | 399 ---------------- .../patches/gdb-7.1-rtems4.11-20100609.diff | 532 --------------------- 2 files changed, 931 deletions(-) delete mode 100644 contrib/crossrpms/patches/gcc-core-4.5.2-rtems4.11-20101216.diff delete mode 100644 contrib/crossrpms/patches/gdb-7.1-rtems4.11-20100609.diff (limited to 'contrib') diff --git a/contrib/crossrpms/patches/gcc-core-4.5.2-rtems4.11-20101216.diff b/contrib/crossrpms/patches/gcc-core-4.5.2-rtems4.11-20101216.diff deleted file mode 100644 index c44ac9772f..0000000000 --- a/contrib/crossrpms/patches/gcc-core-4.5.2-rtems4.11-20101216.diff +++ /dev/null @@ -1,399 +0,0 @@ -diff -Naur gcc-4.5.2.orig/ChangeLog.rtems gcc-4.5.2/ChangeLog.rtems ---- gcc-4.5.2.orig/ChangeLog.rtems 1970-01-01 01:00:00.000000000 +0100 -+++ gcc-4.5.2/ChangeLog.rtems 2010-12-17 16:16:29.569214717 +0100 -@@ -0,0 +1,4 @@ -+2008-02-05 Ralf Corsépius -+ -+ * configure, configure.ac (skipdirs): Add target-libiberty. -+ -diff -Naur gcc-4.5.2.orig/configure gcc-4.5.2/configure ---- gcc-4.5.2.orig/configure 2010-10-06 12:29:55.000000000 +0200 -+++ gcc-4.5.2/configure 2010-12-17 16:16:29.573213982 +0100 -@@ -3291,6 +3291,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. -@@ -7977,7 +7978,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.5.2.orig/configure.ac gcc-4.5.2/configure.ac ---- gcc-4.5.2.orig/configure.ac 2010-10-06 12:29:55.000000000 +0200 -+++ gcc-4.5.2/configure.ac 2010-12-17 16:16:29.574213799 +0100 -@@ -528,6 +528,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. -@@ -3030,7 +3031,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.5.2.orig/gcc/ChangeLog.rtems gcc-4.5.2/gcc/ChangeLog.rtems ---- gcc-4.5.2.orig/gcc/ChangeLog.rtems 1970-01-01 01:00:00.000000000 +0100 -+++ gcc-4.5.2/gcc/ChangeLog.rtems 2010-12-17 16:16:29.574213799 +0100 -@@ -0,0 +1,47 @@ -+2010-05-19 Joel Sherrill -+ -+ * config.gcc (sparc64-*-rtems*): New target. -+ * config/sparc/sp64-rtemself.h: New file. -+ -+2010-04-19 Ralf Corsépius -+ -+ * ginclude/stddef.h: Define _MACHINE_ANSI_H_ if _X86_64_ANSI_H_ is -+ defined (Used by amd64-*-netbsdelf5.*). -+ -+2010-04-18 Ralf Corsépius -+ -+ * ginclude/stddef.h: Define _MACHINE_ANSI_H_ if _I386_ANSI_H_ is -+ defined (Used by i386-*-netbsdelf5.*). -+ -+2010-03-15 Ralf Corsépius -+ -+ Patch from Thomas Doerfler : -+ * config/arm/rtems-elf.h, config/arm/t-rtems: Add optional support -+ for vfp FPU model -+ -+2009-12-01 Ralf Corsépius -+ -+ * config/avr/avr.h (LINK_SPEC): Pass -m avrN to ld for -mmcu=avrN. -+ -+2009-11-04 Ralf Corsépius -+ -+ * config/m32c/rtems.h, config/m68k/rtemself.h, -+ config/m68k/rtemself.h, config/sh/rtemself.h, -+ config/sparc/rtemself.h: Undef WCHAR_TYPE_SIZE, WCHAR_TYPE. -+ (Resets WCHAR_TYPE's to defaults. Prevents broken GCC tm_files -+ to interfere and cause wchar_t/wint_t incompatibilities). -+ -+2009-10-15 Ralf Corsépius -+ -+ * config/avr/t-rtems: Don't build _exit. -+ -+ Ralf Corsépius -+ -+ * config/rs6000/rtems.h: Support for custom RTEMS multilibs. -+ Support TARGET_E500. -+ * config/rs6000/t-rtems: Custom RTEMS multilibs. -+ -+ Ralf Corsépius -+ -+ * config/mips/elf.h: Remove NO_IMPLICIT_EXTERN_C. -+ -diff -Naur gcc-4.5.2.orig/gcc/config/arm/rtems-elf.h gcc-4.5.2/gcc/config/arm/rtems-elf.h ---- gcc-4.5.2.orig/gcc/config/arm/rtems-elf.h 2009-03-25 13:54:16.000000000 +0100 -+++ gcc-4.5.2/gcc/config/arm/rtems-elf.h 2010-12-17 16:16:29.574213799 +0100 -@@ -36,7 +36,7 @@ - */ - #undef SUBTARGET_EXTRA_ASM_SPEC - #define SUBTARGET_EXTRA_ASM_SPEC "\ -- %{!mhard-float: %{!msoft-float:-mfpu=softfpa}}" -+ %{!mhard-float: %{!mfpu=vfp: %{!msoft-float:-mfpu=softfpa}}}" - - /* - * The default includes --start-group and --end-group which conflicts -diff -Naur gcc-4.5.2.orig/gcc/config/arm/t-rtems gcc-4.5.2/gcc/config/arm/t-rtems ---- gcc-4.5.2.orig/gcc/config/arm/t-rtems 2004-11-23 06:30:32.000000000 +0100 -+++ gcc-4.5.2/gcc/config/arm/t-rtems 2010-12-17 16:16:29.574213799 +0100 -@@ -5,6 +5,41 @@ - MULTILIB_EXCEPTIONS = - MULTILIB_MATCHES = marm=mno-thumb - --MULTILIB_OPTIONS += msoft-float/mhard-float --MULTILIB_DIRNAMES += soft fpu --MULTILIB_EXCEPTIONS += *mthumb/*mhard-float* -+MULTILIB_OPTIONS += mhard-float/mfloat-abi=softfp -+MULTILIB_DIRNAMES += fpu softfp -+MULTILIB_EXCEPTIONS += *mthumb*/*mhard-float* *mthumb*/*mfloat-abi=softfp* -+MULTILIB_MATCHES = -+ -+MULTILIB_OPTIONS += mfpu=vfp -+MULTILIB_DIRNAMES += vfp -+MULTILIB_EXCEPTIONS += *mhard-float*/*mfpu=vfp* *marm*/*mfloat-abi=softfp*/*mfpu=fpa* -+MULTILIB_EXCLUSIONS += !mthumb/mfloat-abi=softfp/!mfpu=vfp -+ -+# default float model is fpa, so don't create a explicit copy of it -+MULTILIB_EXCEPTIONS += *marm*/*mfpa* -+ -+# permutations of the options which are useful (+) or make no sense (-), -+# defaults are in brackets: -+# + (arm/soft/fpa) -+# + (arm/soft)/vfp -+# - (arm)/softfp(/fpa) -+# + (arm)/softfp/vfp -+# + (arm)/hard-float(/fpa) -+# - (arm)/hard-float/vfp -+# + thumb/(soft/fpa) -+# + thumb/(soft/)vfp -+# - thumb/softfp/fpa -+# - thumb/softfp/vfp -+# - thumb/hard-float/fpa -+# - thumb/hard-float/vfp -+ -+# subdirs to be used for multilibs and their respective options: -+#/thumb/vfp -> thumb/soft/vfp -+#/thumb/fpa -> thumb/soft/fpa -+#/thumb -> thumb/soft/fpa -+#/vfp -> arm/soft/vfp -+#/softfp/vfp -> arm/softfp/cfp -+#/fpu/fpa -> arm/hard/fpa -+#/fpu -> arm/hard/fpa -+#/fpa -> arm/soft/fpa -+#. -> arm/soft/fpa -diff -Naur gcc-4.5.2.orig/gcc/config/avr/t-rtems gcc-4.5.2/gcc/config/avr/t-rtems ---- gcc-4.5.2.orig/gcc/config/avr/t-rtems 2004-11-23 04:44:03.000000000 +0100 -+++ gcc-4.5.2/gcc/config/avr/t-rtems 2010-12-17 16:16:29.575213615 +0100 -@@ -1,3 +1,4 @@ - # Multilibs for avr RTEMS targets. - --# ATM, this is just a stub -+# RTEMS uses _exit from newlib -+LIB1ASMFUNCS := $(filter-out _exit,$(LIB1ASMFUNCS)) -diff -Naur gcc-4.5.2.orig/gcc/config/m32c/rtems.h gcc-4.5.2/gcc/config/m32c/rtems.h ---- gcc-4.5.2.orig/gcc/config/m32c/rtems.h 2008-12-01 17:34:42.000000000 +0100 -+++ gcc-4.5.2/gcc/config/m32c/rtems.h 2010-12-17 16:16:29.575213615 +0100 -@@ -29,5 +29,9 @@ - } \ - while (0) - --/* Use the default */ -+/* Use the defaults */ - #undef LINK_GCC_C_SEQUENCE_SPEC -+ -+#undef WCHAR_TYPE -+ -+#undef WCHAR_TYPE_SIZE -diff -Naur gcc-4.5.2.orig/gcc/config/m68k/rtemself.h gcc-4.5.2/gcc/config/m68k/rtemself.h ---- gcc-4.5.2.orig/gcc/config/m68k/rtemself.h 2007-08-02 12:49:31.000000000 +0200 -+++ gcc-4.5.2/gcc/config/m68k/rtemself.h 2010-12-17 16:16:29.575213615 +0100 -@@ -31,3 +31,8 @@ - builtin_assert ("system=rtems"); \ - } \ - while (0) -+ -+/* Use the defaults */ -+#undef WCHAR_TYPE -+ -+#undef WCHAR_TYPE_SIZE -diff -Naur gcc-4.5.2.orig/gcc/config/mips/elf.h gcc-4.5.2/gcc/config/mips/elf.h ---- gcc-4.5.2.orig/gcc/config/mips/elf.h 2007-08-02 12:49:31.000000000 +0200 -+++ gcc-4.5.2/gcc/config/mips/elf.h 2010-12-17 16:16:29.575213615 +0100 -@@ -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.5.2.orig/gcc/config/rs6000/rtems.h gcc-4.5.2/gcc/config/rs6000/rtems.h ---- gcc-4.5.2.orig/gcc/config/rs6000/rtems.h 2007-08-02 12:49:31.000000000 +0200 -+++ gcc-4.5.2/gcc/config/rs6000/rtems.h 2010-12-17 16:16:29.575213615 +0100 -@@ -49,8 +49,22 @@ - %{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) -+ -+#undef WCHAR_TYPE -+ -+#undef WCHAR_TYPE_SIZE -diff -Naur gcc-4.5.2.orig/gcc/config/rs6000/t-rtems gcc-4.5.2/gcc/config/rs6000/t-rtems ---- gcc-4.5.2.orig/gcc/config/rs6000/t-rtems 2009-04-21 21:03:23.000000000 +0200 -+++ gcc-4.5.2/gcc/config/rs6000/t-rtems 2010-12-17 16:16:29.575213615 +0100 -@@ -19,12 +19,12 @@ - # . - - 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 - -@@ -47,6 +47,10 @@ - # Map 750 to . - MULTILIB_MATCHES += mcpu?750= - -+# Map e500, 8548 to 8540 -+MULTILIB_MATCHES += mcpu?8540=mcpu?e500 -+MULTILIB_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 = \ -@@ -80,3 +84,4 @@ - MULTILIB_EXCEPTIONS += *mcpu=750/Dmpc* - MULTILIB_EXCEPTIONS += *mcpu=860/Dmpc* - MULTILIB_EXCEPTIONS += *mcpu=7400/Dmpc* -+MULTILIB_EXCEPTIONS += *mcpu=8540/Dmpc* -diff -Naur gcc-4.5.2.orig/gcc/config/sh/rtemself.h gcc-4.5.2/gcc/config/sh/rtemself.h ---- gcc-4.5.2.orig/gcc/config/sh/rtemself.h 2007-08-02 12:49:31.000000000 +0200 -+++ gcc-4.5.2/gcc/config/sh/rtemself.h 2010-12-17 16:16:29.575213615 +0100 -@@ -24,3 +24,8 @@ - builtin_define( "__rtems__" ); \ - builtin_assert( "system=rtems" ); \ - } while (0) -+ -+/* Use the defaults */ -+#undef WCHAR_TYPE -+ -+#undef WCHAR_TYPE_SIZE -diff -Naur gcc-4.5.2.orig/gcc/config/sparc/rtemself.h gcc-4.5.2/gcc/config/sparc/rtemself.h ---- gcc-4.5.2.orig/gcc/config/sparc/rtemself.h 2007-08-02 12:49:31.000000000 +0200 -+++ gcc-4.5.2/gcc/config/sparc/rtemself.h 2010-12-17 16:16:29.576213431 +0100 -@@ -29,5 +29,9 @@ - } \ - while (0) - --/* Use the default */ -+/* Use the defaults */ - #undef LINK_GCC_C_SEQUENCE_SPEC -+ -+#undef WCHAR_TYPE -+ -+#undef WCHAR_TYPE_SIZE -diff -Naur gcc-4.5.2.orig/gcc/config/sparc/sp64-rtemself.h gcc-4.5.2/gcc/config/sparc/sp64-rtemself.h ---- gcc-4.5.2.orig/gcc/config/sparc/sp64-rtemself.h 1970-01-01 01:00:00.000000000 +0100 -+++ gcc-4.5.2/gcc/config/sparc/sp64-rtemself.h 2010-12-17 16:16:29.576213431 +0100 -@@ -0,0 +1,37 @@ -+/* Definitions for rtems targeting a SPARC64 using ELF. -+ Copyright (C) 2010 Free Software Foundation, Inc. -+ Contributed by Joel Sherrill (joel@OARcorp.com). -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 3, or (at your option) -+any later version. -+ -+GCC is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GCC; see the file COPYING3. If not see -+. */ -+ -+/* Target OS builtins. */ -+#undef TARGET_OS_CPP_BUILTINS -+#define TARGET_OS_CPP_BUILTINS() \ -+ do \ -+ { \ -+ builtin_define ("__rtems__"); \ -+ builtin_define ("__USE_INIT_FINI__"); \ -+ builtin_assert ("system=rtems"); \ -+ } \ -+ while (0) -+ -+/* Use the default */ -+#undef LINK_GCC_C_SEQUENCE_SPEC -+ -+/* we are not svr4 */ -+#undef CPP_SUBTARGET_SPEC -+#define CPP_SUBTARGET_SPEC "" -diff -Naur gcc-4.5.2.orig/gcc/config.gcc gcc-4.5.2/gcc/config.gcc ---- gcc-4.5.2.orig/gcc/config.gcc 2010-10-09 11:35:53.000000000 +0200 -+++ gcc-4.5.2/gcc/config.gcc 2010-12-17 16:16:29.577213246 +0100 -@@ -2407,6 +2407,12 @@ - tmake_file="sparc/t-elf sparc/t-crtfm t-rtems" - extra_parts="crti.o crtn.o crtbegin.o crtend.o" - ;; -+sparc64-*-rtems*) -+ tm_file="${tm_file} dbxelf.h elfos.h svr4.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h sparc/sp64-rtemself.h rtems.h" -+ extra_options="${extra_options} sparc/little-endian.opt" -+ tmake_file="${tmake_file} sparc/t-crtfm t-rtems" -+ extra_parts="crtbegin.o crtend.o" -+ ;; - sparc*-*-solaris2*) - tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h" - case ${target} in -diff -Naur gcc-4.5.2.orig/gcc/ginclude/stddef.h gcc-4.5.2/gcc/ginclude/stddef.h ---- gcc-4.5.2.orig/gcc/ginclude/stddef.h 2009-04-09 17:00:19.000000000 +0200 -+++ gcc-4.5.2/gcc/ginclude/stddef.h 2010-12-17 16:16:29.577213246 +0100 -@@ -53,7 +53,13 @@ - one less case to deal with in the following. */ - #if defined (__BSD_NET2__) || defined (____386BSD____) || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) || defined(__NetBSD__) - #include -+#if !defined(_MACHINE_ANSI_H_) -+#if defined(_I386_ANSI_H_) || defined(_X86_64_ANSI_H_) -+#define _MACHINE_ANSI_H_ - #endif -+#endif -+#endif -+ - /* On FreeBSD 5, machine/ansi.h does not exist anymore... */ - #if defined (__FreeBSD__) && (__FreeBSD__ >= 5) - #include -diff -Naur gcc-4.5.2.orig/libgcc/ChangeLog.rtems gcc-4.5.2/libgcc/ChangeLog.rtems ---- gcc-4.5.2.orig/libgcc/ChangeLog.rtems 1970-01-01 01:00:00.000000000 +0100 -+++ gcc-4.5.2/libgcc/ChangeLog.rtems 2010-12-17 16:16:29.577213246 +0100 -@@ -0,0 +1,9 @@ -+2010-08-17 Ralf Corsépius -+ -+ 1669/Tools, GCC-BZ 44793 -+ * config.host (powerpc-*-rtems*): Add tmake_file. -+ Add extra_parts. -+ -+2010-05-19 Joel Sherrill -+ -+ * config.host (sparc64-*-rtems*): New target. -diff -Naur gcc-4.5.2.orig/libgcc/config.host gcc-4.5.2/libgcc/config.host ---- gcc-4.5.2.orig/libgcc/config.host 2010-09-12 05:27:09.000000000 +0200 -+++ gcc-4.5.2/libgcc/config.host 2010-12-17 16:16:29.578213062 +0100 -@@ -468,6 +468,8 @@ - powerpc-*-eabi*) - ;; - powerpc-*-rtems*) -+ tmake_file="${tmake_file} rs6000/t-ppccomm t-softfp" -+ extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o" - ;; - powerpc-*-linux* | powerpc64-*-linux*) - tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ldbl128 t-softfp" -@@ -537,7 +539,7 @@ - extra_parts="$extra_parts crtfastmath.o" - tmake_file="${tmake_file} sparc/t-crtfm" - ;; --sparc-*-rtems*) -+sparc-*-rtems* | sparc64-*-rtems* ) - ;; - sparc64-*-solaris2* | sparcv9-*-solaris2*) - ;; diff --git a/contrib/crossrpms/patches/gdb-7.1-rtems4.11-20100609.diff b/contrib/crossrpms/patches/gdb-7.1-rtems4.11-20100609.diff deleted file mode 100644 index bff2482ae1..0000000000 --- a/contrib/crossrpms/patches/gdb-7.1-rtems4.11-20100609.diff +++ /dev/null @@ -1,532 +0,0 @@ -diff -Naur gdb-7.1.orig/gdb/lm32-tdep.c gdb-7.1/gdb/lm32-tdep.c ---- gdb-7.1.orig/gdb/lm32-tdep.c 2010-01-01 08:31:37.000000000 +0100 -+++ gdb-7.1/gdb/lm32-tdep.c 2010-06-09 08:54:08.000000000 +0200 -@@ -35,7 +35,7 @@ - #include "regcache.h" - #include "trad-frame.h" - #include "reggroups.h" --#include "opcodes/lm32-desc.h" -+#include "../opcodes/lm32-desc.h" - - #include "gdb_string.h" - -diff -Naur gdb-7.1.orig/gdb/sparc-tdep.c gdb-7.1/gdb/sparc-tdep.c ---- gdb-7.1.orig/gdb/sparc-tdep.c 2010-01-01 08:31:42.000000000 +0100 -+++ gdb-7.1/gdb/sparc-tdep.c 2010-06-09 08:54:08.000000000 +0200 -@@ -1100,7 +1100,7 @@ - sparc32_store_return_value (struct type *type, struct regcache *regcache, - const gdb_byte *valbuf) - { -- int len = TYPE_LENGTH (type); -+ size_t len = TYPE_LENGTH (type); - gdb_byte buf[8]; - - gdb_assert (!sparc_structure_or_union_p (type)); -diff -Naur gdb-7.1.orig/sim/erc32/configure gdb-7.1/sim/erc32/configure ---- gdb-7.1.orig/sim/erc32/configure 2010-01-09 22:11:39.000000000 +0100 -+++ gdb-7.1/sim/erc32/configure 2010-06-09 08:54:08.000000000 +0200 -@@ -591,8 +591,9 @@ - ac_subst_vars='LTLIBOBJS - LIBOBJS - cgen_breaks -+READLINE_CFLAGS -+READLINE_DEPS - READLINE --TERMCAP - REPORT_BUGS_TEXI - REPORT_BUGS_TO - PKGVERSION -@@ -716,6 +717,7 @@ - enable_sim_profile - with_pkgversion - with_bugurl -+with_system_readline - ' - ac_precious_vars='build_alias - host_alias -@@ -1358,6 +1360,7 @@ - --with-zlib include zlib support (auto/yes/no) default=auto - --with-pkgversion=PKG Use PKG in the version string in place of "GDB" - --with-bugurl=URL Direct users to URL to report a bug -+ --with-system-readline use installed readline library - - Some influential environment variables: - CC C compiler command -@@ -2416,7 +2419,6 @@ - - - -- - # Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around - # it by inlining the macro's contents. - # This file contains common code used by all simulators. -@@ -2916,18 +2918,18 @@ - int - main () - { -- -+return 0; - ; - return 0; - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" -+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 --$as_echo_n "checking for C compiler default output file name... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -+$as_echo_n "checking whether the C compiler works... " >&6; } - ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - - # The possible output files: -@@ -2989,10 +2991,10 @@ - else - ac_file='' - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 --$as_echo "$ac_file" >&6; } - if test -z "$ac_file"; then : -- $as_echo "$as_me: failed program was:" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+$as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -@@ -3000,51 +3002,18 @@ - { as_fn_set_status 77 - as_fn_error "C compiler cannot create executables - See \`config.log' for more details." "$LINENO" 5; }; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -+$as_echo_n "checking for C compiler default output file name... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -+$as_echo "$ac_file" >&6; } - ac_exeext=$ac_cv_exeext - --# Check that the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 --$as_echo_n "checking whether the C compiler works... " >&6; } --# If not cross compiling, check that we can run a simple program. --if test "$cross_compiling" != yes; then -- if { ac_try='./$ac_file' -- { { case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" --$as_echo "$ac_try_echo"; } >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; }; then -- cross_compiling=no -- else -- if test "$cross_compiling" = maybe; then -- cross_compiling=yes -- else -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." "$LINENO" 5; } -- fi -- fi --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- --rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out -+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save --# Check that the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 --$as_echo_n "checking whether we are cross compiling... " >&6; } --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 --$as_echo "$cross_compiling" >&6; } -- - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 - $as_echo_n "checking for suffix of executables... " >&6; } - if { { ac_try="$ac_link" -@@ -3084,6 +3053,63 @@ - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+ac_clean_files="$ac_clean_files conftest.out" -+# Check that the compiler produces executables we can run. If not, either -+# the compiler is broken, or we cross compile. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -+$as_echo_n "checking whether we are cross compiling... " >&6; } -+if test "$cross_compiling" != yes; then -+ { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if { ac_try='./conftest$ac_cv_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then -+ cross_compiling=no -+ else -+ if test "$cross_compiling" = maybe; then -+ cross_compiling=yes -+ else -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error "cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details." "$LINENO" 5; } -+ fi -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -+$as_echo "$cross_compiling" >&6; } -+ -+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -+ac_clean_files=$ac_clean_files_save - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 - $as_echo_n "checking for suffix of object files... " >&6; } - if test "${ac_cv_objext+set}" = set; then : -@@ -4532,86 +4558,41 @@ - done - - --# In the Cygwin environment, we need some additional flags. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cygwin" >&5 --$as_echo_n "checking for cygwin... " >&6; } --if test "${sim_cv_os_cygwin+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ - --#ifdef __CYGWIN__ --lose --#endif --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "lose" >/dev/null 2>&1; then : -- sim_cv_os_cygwin=yes --else -- sim_cv_os_cygwin=no -+# Check whether --with-system-readline was given. -+if test "${with_system_readline+set}" = set; then : -+ withval=$with_system_readline; - fi --rm -f conftest* - --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_cv_os_cygwin" >&5 --$as_echo "$sim_cv_os_cygwin" >&6; } - --if test x$sim_cv_os_cygwin = xyes; then -- TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32' --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ltermcap" >&5 --$as_echo_n "checking for main in -ltermcap... " >&6; } --if test "${ac_cv_lib_termcap_main+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ltermcap $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+if test "$with_system_readline" = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline" >&5 -+$as_echo_n "checking for readline... " >&6; } -+ save_LIBS="$LIBS" -+ LIBS="-lreadline $save_LIBS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -- -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char add_history (); - int - main () - { --return main (); -+return add_history (); - ; - return 0; - } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_termcap_main=yes --else -- ac_cv_lib_termcap_main=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_main" >&5 --$as_echo "$ac_cv_lib_termcap_main" >&6; } --if test "x$ac_cv_lib_termcap_main" = x""yes; then : -- TERMCAP=-ltermcap --else -- TERMCAP="" --fi -- --fi -- -- --# We prefer the in-tree readline. Top-level dependencies make sure --# src/readline (if it's there) is configured before src/sim. --if test -r ../../readline/Makefile; then -- READLINE=../../readline/libreadline.a --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 --$as_echo_n "checking for readline in -lreadline... " >&6; } --if test "${ac_cv_lib_readline_readline+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+ READLINE=-lreadline - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lreadline $TERMCAP $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ LIBS="-lreadline -lncurses $save_LIBS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -4620,33 +4601,39 @@ - #ifdef __cplusplus - extern "C" - #endif --char readline (); -+char add_history (); - int - main () - { --return readline (); -+return add_history (); - ; - return 0; - } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_readline_readline=yes -+ READLINE="-lreadline -lncurses" - else -- ac_cv_lib_readline_readline=no -+ as_fn_error "unable to detect readline" "$LINENO" 5 - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5 --$as_echo "$ac_cv_lib_readline_readline" >&6; } --if test "x$ac_cv_lib_readline_readline" = x""yes; then : -- READLINE=-lreadline --else -- as_fn_error "the required \"readline\" library is missing" "$LINENO" 5 -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$save_LIBS" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE" >&5 -+$as_echo "$READLINE" >&6; } -+ READLINE_DEPS= -+ READLINE_CFLAGS= -+else -+ READLINE='../../readline/libreadline.a -lncurses' -+ READLINE_DEPS='$(READLINE)' -+ READLINE_CFLAGS='-I$(READLINE_SRC)/..' - fi - --fi -+ -+ - - - ac_sources="$sim_link_files" -diff -Naur gdb-7.1.orig/sim/erc32/configure.ac gdb-7.1/sim/erc32/configure.ac ---- gdb-7.1.orig/sim/erc32/configure.ac 2006-12-20 23:35:51.000000000 +0100 -+++ gdb-7.1/sim/erc32/configure.ac 2010-06-09 08:54:08.000000000 +0200 -@@ -11,27 +11,32 @@ - - AC_CHECK_HEADERS(stdlib.h) - --# In the Cygwin environment, we need some additional flags. --AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin, --[AC_EGREP_CPP(lose, [ --#ifdef __CYGWIN__ --lose --#endif],[sim_cv_os_cygwin=yes],[sim_cv_os_cygwin=no])]) -+AC_ARG_WITH([system-readline], -+ [AS_HELP_STRING([--with-system-readline], -+ [use installed readline library])]) - --if test x$sim_cv_os_cygwin = xyes; then -- TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32' -+if test "$with_system_readline" = yes; then -+ AC_MSG_CHECKING([for readline]) -+ save_LIBS="$LIBS" -+ LIBS="-lreadline $save_LIBS" -+ AC_LINK_IFELSE([AC_LANG_CALL([], -+ [add_history])], [READLINE=-lreadline], -+ [ LIBS="-lreadline -lncurses $save_LIBS" -+ AC_LINK_IFELSE([AC_LANG_CALL([], -+ [add_history])], [READLINE="-lreadline -lncurses"], -+ [AC_MSG_ERROR([unable to detect readline])]) -+ ]) -+ LIBS="$save_LIBS" -+ AC_MSG_RESULT($READLINE) -+ READLINE_DEPS= -+ READLINE_CFLAGS= - else -- AC_CHECK_LIB(termcap, main, TERMCAP=-ltermcap, TERMCAP="") --fi --AC_SUBST(TERMCAP) -- --# We prefer the in-tree readline. Top-level dependencies make sure --# src/readline (if it's there) is configured before src/sim. --if test -r ../../readline/Makefile; then -- READLINE=../../readline/libreadline.a --else -- AC_CHECK_LIB(readline, readline, READLINE=-lreadline, -- AC_ERROR([the required "readline" library is missing]), $TERMCAP) -+ READLINE='../../readline/libreadline.a -lncurses' -+ READLINE_DEPS='$(READLINE)' -+ READLINE_CFLAGS='-I$(READLINE_SRC)/..' - fi - AC_SUBST(READLINE) -+AC_SUBST(READLINE_DEPS) -+AC_SUBST(READLINE_CFLAGS) -+ - SIM_AC_OUTPUT -diff -Naur gdb-7.1.orig/sim/erc32/erc32.c gdb-7.1/sim/erc32/erc32.c ---- gdb-7.1.orig/sim/erc32/erc32.c 2008-11-11 23:20:54.000000000 +0100 -+++ gdb-7.1/sim/erc32/erc32.c 2010-06-09 08:54:08.000000000 +0200 -@@ -414,7 +414,7 @@ - if (rom8) mec_memcfg &= ~0x20000; - else mec_memcfg |= 0x20000; - -- mem_ramsz = (256 * 1024) << ((mec_memcfg >> 10) & 7); -+ mem_ramsz = (512 * 1024) << ((mec_memcfg >> 10) & 7); - mem_romsz = (128 * 1024) << ((mec_memcfg >> 18) & 7); - - if (sparclite_board) { -diff -Naur gdb-7.1.orig/sim/erc32/Makefile.in gdb-7.1/sim/erc32/Makefile.in ---- gdb-7.1.orig/sim/erc32/Makefile.in 2010-01-01 11:03:28.000000000 +0100 -+++ gdb-7.1/sim/erc32/Makefile.in 2010-06-09 08:54:08.000000000 +0200 -@@ -19,12 +19,12 @@ - - ## COMMON_PRE_CONFIG_FRAG - --TERMCAP_LIB = @TERMCAP@ -+# TERMCAP_LIB = -lncurses - READLINE_LIB = @READLINE@ - - SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o - SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm --SIM_EXTRA_ALL = sis -+SIM_EXTRA_ALL = sis$(EXEEXT) - SIM_EXTRA_INSTALL = install-sis - SIM_EXTRA_CLEAN = clean-sis - -@@ -38,8 +38,8 @@ - # `sis' doesn't need interf.o. - SIS_OFILES = exec.o erc32.o func.o help.o float.o - --sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS) -- $(CC) $(ALL_CFLAGS) -o sis \ -+sis$(EXEEXT): sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS) -+ $(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \ - sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS) - - # FIXME: This computes the build host's endianness, doesn't it? -@@ -52,11 +52,11 @@ - - # Copy the files into directories where they will be run. - install-sis: installdirs -- n=`echo sis | sed '$(program_transform_name)'`; \ -- $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) -+ n=`echo sis$(EXEEXT) | sed '$(program_transform_name)'`; \ -+ $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n - - clean-sis: -- rm -f sis end end.h -+ rm -f sis$(EXEEXT) end end.h - - configure: - @echo "Rebuilding configure..." -diff -Naur gdb-7.1.orig/sim/h8300/compile.c gdb-7.1/sim/h8300/compile.c ---- gdb-7.1.orig/sim/h8300/compile.c 2009-12-09 06:32:16.000000000 +0100 -+++ gdb-7.1/sim/h8300/compile.c 2010-06-09 08:54:08.000000000 +0200 -@@ -38,6 +38,12 @@ - # define SIGTRAP 5 - #endif - -+#ifdef _WIN32 -+#ifndef SIGBUS -+#define SIGBUS 10 -+#endif -+#endif -+ - int debug; - - host_callback *sim_callback; -diff -Naur gdb-7.1.orig/sim/m32c/Makefile.in gdb-7.1/sim/m32c/Makefile.in ---- gdb-7.1.orig/sim/m32c/Makefile.in 2010-01-01 11:03:31.000000000 +0100 -+++ gdb-7.1/sim/m32c/Makefile.in 2010-06-09 08:54:08.000000000 +0200 -@@ -55,7 +55,7 @@ - ./opc2c -l m32c.out $(srcdir)/m32c.opc > m32c.c - - opc2c : opc2c.o safe-fgets.o -- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $^ -o $@ - - sample.x : $(srcdir)/sample.S $(srcdir)/sample.ld - ../../gcc/xgcc $(CPUFLAGS) -B../../gcc/ -c $(srcdir)/sample.S -o sample.o -@@ -83,8 +83,10 @@ - mem.o : mem.h cpu.h syscalls.h - misc.o : cpu.h misc.h - opc2c.o : safe-fgets.h -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/opc2c.c - reg.o : cpu.h - safe-fgets.o : safe-fgets.h -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/safe-fgets.c - srcdest.c : cpu.h mem.h - syscalls.c : cpu.h mem.h syscalls.h - -- cgit v1.2.3