[rtems-crossrpms commit] Remove (Unused).
Ralf Corsepius
ralf at rtems.org
Sun Dec 8 18:17:58 UTC 2013
Module: rtems-crossrpms
Branch: master
Commit: 314de7b17621adbf217ee9f2ced70d8b1fd4b648
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=314de7b17621adbf217ee9f2ced70d8b1fd4b648
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Sat Aug 31 05:34:24 2013 +0200
Remove (Unused).
---
patches/gdb-7.4-rtems4.11-20120125.diff | 438 ---------------
patches/gdb-7.4.1-rtems4.11-20120706.diff | 692 ------------------------
patches/gdb-7.5-rtems4.11-20120928.diff | 778 ---------------------------
patches/gdb-7.5-rtems4.11-20121003.diff | 833 -----------------------------
4 files changed, 0 insertions(+), 2741 deletions(-)
diff --git a/patches/gdb-7.4-rtems4.11-20120125.diff b/patches/gdb-7.4-rtems4.11-20120125.diff
deleted file mode 100644
index b98d6e6..0000000
--- a/patches/gdb-7.4-rtems4.11-20120125.diff
+++ /dev/null
@@ -1,438 +0,0 @@
-diff -Naur gdb-7.4.orig/gdb/lm32-tdep.c gdb-7.4/gdb/lm32-tdep.c
---- gdb-7.4.orig/gdb/lm32-tdep.c 2012-01-06 05:43:19.000000000 +0100
-+++ gdb-7.4/gdb/lm32-tdep.c 2012-01-24 15:00:15.484226440 +0100
-@@ -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.4.orig/gdb/sparc-tdep.c gdb-7.4/gdb/sparc-tdep.c
---- gdb-7.4.orig/gdb/sparc-tdep.c 2012-01-06 05:43:30.000000000 +0100
-+++ gdb-7.4/gdb/sparc-tdep.c 2012-01-24 15:00:15.484226440 +0100
-@@ -1305,7 +1305,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.4.orig/sim/bfin/ChangeLog.rtems gdb-7.4/sim/bfin/ChangeLog.rtems
---- gdb-7.4.orig/sim/bfin/ChangeLog.rtems 1970-01-01 01:00:00.000000000 +0100
-+++ gdb-7.4/sim/bfin/ChangeLog.rtems 2012-01-25 06:23:05.498110610 +0100
-@@ -0,0 +1,4 @@
-+2012-01-25 Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+ * dv-eth_phy.c:
-+ Remove #define _LINUX_TYPES_H, #define __u16.
-diff -Naur gdb-7.4.orig/sim/bfin/dv-eth_phy.c gdb-7.4/sim/bfin/dv-eth_phy.c
---- gdb-7.4.orig/sim/bfin/dv-eth_phy.c 2012-01-06 05:54:38.000000000 +0100
-+++ gdb-7.4/sim/bfin/dv-eth_phy.c 2012-01-25 05:35:16.204109337 +0100
-@@ -25,9 +25,6 @@
-
- #ifdef HAVE_LINUX_MII_H
-
--/* Workaround old/broken linux headers. */
--#define _LINUX_TYPES_H
--#define __u16 unsigned short
- #include <linux/mii.h>
-
- #define REG_PHY_SIZE 0x20
-diff -Naur gdb-7.4.orig/sim/common/gentmap.c gdb-7.4/sim/common/gentmap.c
---- gdb-7.4.orig/sim/common/gentmap.c 2006-11-07 20:29:59.000000000 +0100
-+++ gdb-7.4/sim/common/gentmap.c 2012-01-24 15:00:15.493226575 +0100
-@@ -2,6 +2,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
-
- struct tdefs {
- char *symbol;
-diff -Naur gdb-7.4.orig/sim/erc32/configure gdb-7.4/sim/erc32/configure
---- gdb-7.4.orig/sim/erc32/configure 2011-12-03 19:23:45.000000000 +0100
-+++ gdb-7.4/sim/erc32/configure 2012-01-24 15:00:15.494226590 +0100
-@@ -591,8 +591,9 @@
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
- cgen_breaks
-+READLINE_CFLAGS
-+READLINE_DEPS
- READLINE
--TERMCAP
- REPORT_BUGS_TEXI
- REPORT_BUGS_TO
- PKGVERSION
-@@ -722,6 +723,7 @@
- enable_sim_profile
- with_pkgversion
- with_bugurl
-+with_system_readline
- '
- ac_precious_vars='build_alias
- host_alias
-@@ -1364,6 +1366,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
-@@ -4737,86 +4740,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.
-@@ -4825,33 +4783,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.4.orig/sim/erc32/configure.ac gdb-7.4/sim/erc32/configure.ac
---- gdb-7.4.orig/sim/erc32/configure.ac 2011-10-18 02:30:57.000000000 +0200
-+++ gdb-7.4/sim/erc32/configure.ac 2012-01-24 15:00:15.495226605 +0100
-@@ -7,27 +7,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.4.orig/sim/erc32/erc32.c gdb-7.4/sim/erc32/erc32.c
---- gdb-7.4.orig/sim/erc32/erc32.c 2010-05-11 16:18:20.000000000 +0200
-+++ gdb-7.4/sim/erc32/erc32.c 2012-01-24 15:00:15.495226605 +0100
-@@ -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.4.orig/sim/erc32/Makefile.in gdb-7.4/sim/erc32/Makefile.in
---- gdb-7.4.orig/sim/erc32/Makefile.in 2012-01-06 05:54:43.000000000 +0100
-+++ gdb-7.4/sim/erc32/Makefile.in 2012-01-24 15:00:15.496226620 +0100
-@@ -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.4.orig/sim/h8300/compile.c gdb-7.4/sim/h8300/compile.c
---- gdb-7.4.orig/sim/h8300/compile.c 2011-07-05 21:06:37.000000000 +0200
-+++ gdb-7.4/sim/h8300/compile.c 2012-01-24 15:00:15.497226635 +0100
-@@ -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.4.orig/sim/m32c/Makefile.in gdb-7.4/sim/m32c/Makefile.in
---- gdb-7.4.orig/sim/m32c/Makefile.in 2012-01-06 05:54:51.000000000 +0100
-+++ gdb-7.4/sim/m32c/Makefile.in 2012-01-24 15:00:15.497226635 +0100
-@@ -55,7 +55,7 @@
- ./opc2c -l m32c.out $(srcdir)/m32c.opc > m32c.c
-
- opc2c : opc2c.o safe-fgets.o
-- $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) $^ -o $@ $(BUILD_LIBS)
-+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $^ -o $@ $(BUILD_LIBS)
-
- sample.x : $(srcdir)/sample.S $(srcdir)/sample.ld
- ../../gcc/xgcc $(CPUFLAGS) -B../../gcc/ -c $(srcdir)/sample.S -o sample.o
-@@ -89,8 +89,8 @@
- r8c.o : cpu.h mem.h misc.h int.h
-
- opc2c.o : opc2c.c safe-fgets.h
-- $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/opc2c.c
-+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/opc2c.c
-
- safe-fgets.o : safe-fgets.c safe-fgets.h
-- $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/safe-fgets.c
-+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/safe-fgets.c
-
-diff -Naur gdb-7.4.orig/sim/ppc/device.c gdb-7.4/sim/ppc/device.c
---- gdb-7.4.orig/sim/ppc/device.c 2011-02-14 06:14:27.000000000 +0100
-+++ gdb-7.4/sim/ppc/device.c 2012-01-24 15:00:15.498226651 +0100
-@@ -1816,7 +1816,7 @@
- /* I/O */
-
- EXTERN_DEVICE\
--(void volatile)
-+(void)
- device_error(device *me,
- const char *fmt,
- ...)
-diff -Naur gdb-7.4.orig/sim/ppc/device.h gdb-7.4/sim/ppc/device.h
---- gdb-7.4.orig/sim/ppc/device.h 2001-12-14 01:22:12.000000000 +0100
-+++ gdb-7.4/sim/ppc/device.h 2012-01-24 15:00:15.499226666 +0100
-@@ -727,7 +727,7 @@
- */
-
- EXTERN_DEVICE\
--(void volatile) device_error
-+(void) device_error
- (device *me,
- const char *fmt,
- ...) __attribute__ ((format (printf, 2, 3)));
-diff -Naur gdb-7.4.orig/sim/ppc/hw_glue.c gdb-7.4/sim/ppc/hw_glue.c
---- gdb-7.4.orig/sim/ppc/hw_glue.c 1999-04-16 03:35:09.000000000 +0200
-+++ gdb-7.4/sim/ppc/hw_glue.c 2012-01-24 15:00:15.499226666 +0100
-@@ -194,13 +194,13 @@
- if (glue->sizeof_output == 0)
- device_error(me, "at least one reg property size must be nonzero");
- if (glue->sizeof_output % sizeof(unsigned_word) != 0)
-- device_error(me, "reg property size must be %d aligned", sizeof(unsigned_word));
-+ device_error(me, "reg property size must be %zd aligned", sizeof(unsigned_word));
- /* and the address */
- device_address_to_attach_address(device_parent(me),
- &unit.address, &glue->space, &glue->address,
- me);
- if (glue->address % (sizeof(unsigned_word) * max_nr_interrupts) != 0)
-- device_error(me, "reg property address must be %d aligned",
-+ device_error(me, "reg property address must be %zd aligned",
- sizeof(unsigned_word) * max_nr_interrupts);
- glue->nr_outputs = glue->sizeof_output / sizeof(unsigned_word);
- glue->output = zalloc(glue->sizeof_output);
diff --git a/patches/gdb-7.4.1-rtems4.11-20120706.diff b/patches/gdb-7.4.1-rtems4.11-20120706.diff
deleted file mode 100644
index 483d4aa..0000000
--- a/patches/gdb-7.4.1-rtems4.11-20120706.diff
+++ /dev/null
@@ -1,692 +0,0 @@
-diff -Naur gdb-7.4.1.orig/gdb/ChangeLog gdb-7.4.1/gdb/ChangeLog
---- gdb-7.4.1.orig/gdb/ChangeLog 2012-04-26 17:07:22.000000000 +0200
-+++ gdb-7.4.1/gdb/ChangeLog 2012-07-06 06:08:31.108853252 +0200
-@@ -1,3 +1,26 @@
-+2012-07-06 Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+ Backport from mainline: 2012-04-05 Kevin Buettner <kevinb at redhat.com>
-+
-+ * v850-tdep.c (E_NUM_OF_V850_REGS, E_NUM_OF_V850E_REGS): Fix
-+ fencepost error.
-+ (v850_frame_cache): Use gdbarch_num_regs() instead of E_NUM_REGS.
-+ (v850_gdbarch_init): Set `num_regs' as appropriate for the
-+ architecture.
-+
-+ Backport from mainline: 2012-03-28 Rathish C <rathish.c at kpitcummins.com>
-+
-+ * v850-tdep.c: Add the enum values for mpu and fpu registers.
-+ (v850_register_name): Add the mpu and fpu register names.
-+ (v850e_register_name): Add the mpu and fpu register names.
-+ (v850e2_register_name): New function.
-+ (v850_gdbarch_init): Add case for bfd_mach_v850e2 and
-+ bfd_mach_v850e2v3.
-+
-+2012-06-27 Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+ * configure.tgt: Add v850*-*-rtems*.
-+
- 2012-04-26 Joel Brobecker <brobecker at adacore.com>
-
- * version.in: Update GDB version number to 7.4.1.
-diff -Naur gdb-7.4.1.orig/gdb/configure.tgt gdb-7.4.1/gdb/configure.tgt
---- gdb-7.4.1.orig/gdb/configure.tgt 2011-08-14 16:03:44.000000000 +0200
-+++ gdb-7.4.1/gdb/configure.tgt 2012-07-06 06:08:31.109853269 +0200
-@@ -569,7 +569,7 @@
- # No simulator libraries are needed -- target uses SID.
- ;;
-
--v850*-*-elf)
-+v850*-*-elf|v850*-*-rtems*)
- # Target: NEC V850 processor
- gdb_target_obs="v850-tdep.o"
- gdb_sim=../sim/v850/libsim.a
-diff -Naur gdb-7.4.1.orig/gdb/lm32-tdep.c gdb-7.4.1/gdb/lm32-tdep.c
---- gdb-7.4.1.orig/gdb/lm32-tdep.c 2012-01-06 05:43:19.000000000 +0100
-+++ gdb-7.4.1/gdb/lm32-tdep.c 2012-07-06 06:08:31.111853303 +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.4.1.orig/gdb/sparc-tdep.c gdb-7.4.1/gdb/sparc-tdep.c
---- gdb-7.4.1.orig/gdb/sparc-tdep.c 2012-01-06 05:43:30.000000000 +0100
-+++ gdb-7.4.1/gdb/sparc-tdep.c 2012-07-06 06:08:31.111853303 +0200
-@@ -1305,7 +1305,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.4.1.orig/gdb/v850-tdep.c gdb-7.4.1/gdb/v850-tdep.c
---- gdb-7.4.1.orig/gdb/v850-tdep.c 2012-01-06 05:54:33.000000000 +0100
-+++ gdb-7.4.1/gdb/v850-tdep.c 2012-07-06 06:08:31.112853320 +0200
-@@ -102,6 +102,98 @@
- E_R63_REGNUM,
- E_R64_REGNUM, E_PC_REGNUM = E_R64_REGNUM,
- E_R65_REGNUM,
-+ E_NUM_OF_V850_REGS,
-+ E_NUM_OF_V850E_REGS = E_NUM_OF_V850_REGS,
-+
-+ /* mpu0 system registers */
-+ E_R66_REGNUM = E_NUM_OF_V850_REGS,
-+ E_R67_REGNUM,
-+ E_R68_REGNUM,
-+ E_R69_REGNUM,
-+ E_R70_REGNUM,
-+ E_R71_REGNUM,
-+ E_R72_REGNUM,
-+ E_R73_REGNUM,
-+ E_R74_REGNUM,
-+ E_R75_REGNUM,
-+ E_R76_REGNUM,
-+ E_R77_REGNUM,
-+ E_R78_REGNUM,
-+ E_R79_REGNUM,
-+ E_R80_REGNUM,
-+ E_R81_REGNUM,
-+ E_R82_REGNUM,
-+ E_R83_REGNUM,
-+ E_R84_REGNUM,
-+ E_R85_REGNUM,
-+ E_R86_REGNUM,
-+ E_R87_REGNUM,
-+ E_R88_REGNUM,
-+ E_R89_REGNUM,
-+ E_R90_REGNUM,
-+ E_R91_REGNUM,
-+ E_R92_REGNUM,
-+ E_R93_REGNUM,
-+
-+ /* mpu1 system registers */
-+
-+ E_R94_REGNUM,
-+ E_R95_REGNUM,
-+ E_R96_REGNUM,
-+ E_R97_REGNUM,
-+ E_R98_REGNUM,
-+ E_R99_REGNUM,
-+ E_R100_REGNUM,
-+ E_R101_REGNUM,
-+ E_R102_REGNUM,
-+ E_R103_REGNUM,
-+ E_R104_REGNUM,
-+ E_R105_REGNUM,
-+ E_R106_REGNUM,
-+ E_R107_REGNUM,
-+ E_R108_REGNUM,
-+ E_R109_REGNUM,
-+ E_R110_REGNUM,
-+ E_R111_REGNUM,
-+ E_R112_REGNUM,
-+ E_R113_REGNUM,
-+ E_R114_REGNUM,
-+ E_R115_REGNUM,
-+ E_R116_REGNUM,
-+ E_R117_REGNUM,
-+ E_R118_REGNUM,
-+ E_R119_REGNUM,
-+ E_R120_REGNUM,
-+ E_R121_REGNUM,
-+
-+ /* fpu system registers */
-+ E_R122_REGNUM,
-+ E_R123_REGNUM,
-+ E_R124_REGNUM,
-+ E_R125_REGNUM,
-+ E_R126_REGNUM,
-+ E_R127_REGNUM,
-+ E_R128_REGNUM, E_FPSR_REGNUM = E_R128_REGNUM,
-+ E_R129_REGNUM, E_FPEPC_REGNUM = E_R129_REGNUM,
-+ E_R130_REGNUM, E_FPST_REGNUM = E_R130_REGNUM,
-+ E_R131_REGNUM, E_FPCC_REGNUM = E_R131_REGNUM,
-+ E_R132_REGNUM, E_FPCFG_REGNUM = E_R132_REGNUM,
-+ E_R133_REGNUM,
-+ E_R134_REGNUM,
-+ E_R135_REGNUM,
-+ E_R136_REGNUM,
-+ E_R137_REGNUM,
-+ E_R138_REGNUM,
-+ E_R139_REGNUM,
-+ E_R140_REGNUM,
-+ E_R141_REGNUM,
-+ E_R142_REGNUM,
-+ E_R143_REGNUM,
-+ E_R144_REGNUM,
-+ E_R145_REGNUM,
-+ E_R146_REGNUM,
-+ E_R147_REGNUM,
-+ E_R148_REGNUM,
- E_NUM_REGS
- };
-
-@@ -152,7 +244,7 @@
- "sr24", "sr25", "sr26", "sr27", "sr28", "sr29", "sr30", "sr31",
- "pc", "fp"
- };
-- if (regnum < 0 || regnum >= E_NUM_REGS)
-+ if (regnum < 0 || regnum > E_NUM_OF_V850_REGS)
- return NULL;
- return v850_reg_names[regnum];
- }
-@@ -172,11 +264,50 @@
- "sr24", "sr25", "sr26", "sr27", "sr28", "sr29", "sr30", "sr31",
- "pc", "fp"
- };
-- if (regnum < 0 || regnum >= E_NUM_REGS)
-+ if (regnum < 0 || regnum > E_NUM_OF_V850E_REGS)
- return NULL;
- return v850e_reg_names[regnum];
- }
-
-+static const char *
-+v850e2_register_name (struct gdbarch *gdbarch, int regnum)
-+{
-+ static const char *v850e2_reg_names[] =
-+ {
-+ "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
-+ "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15",
-+ "r16", "r17", "r18", "r19", "r20", "r21", "r22", "r23",
-+ "r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31",
-+
-+ "eipc", "eipsw", "fepc", "fepsw", "ecr", "psw", "sr6", "sr7",
-+ "sr8", "sr9", "sr10", "sr11", "sr12", "sr13", "sr14", "sr15",
-+ "ctpc", "ctpsw", "dbpc", "dbpsw", "ctbp", "sr21", "sr22", "sr23",
-+ "sr24", "sr25", "sr26", "sr27", "sr28", "sr29", "sr30", "sr31",
-+ "pc", "fp"
-+
-+ /* mpu0 system registers */
-+ "vip", "sr33", "sr34", "sr35", "vmecr", "vmtid", "vmadr", "sr39",
-+ "vpecr", "vptid", "vpadr", "sr43", "vdecr", "vdtid", "sr46", "sr47",
-+ "sr48", "sr49", "sr50", "sr51", "sr52", "sr53", "sr54", "sr55",
-+ "sr56", "sr57", "sr58", "sr59",
-+
-+ /* mpu1 system registers */
-+ "mpm", "mpc", "tid", "ppa", "ppm", "ppc", "dcc", "dcv0",
-+ "dcv1", "sr69", "spal", "spau", "ipa0l", "ipa0u", "ipa1l", "ipa1u",
-+ "iap2l", "ipa2u", "ipa3l", "ipa3u", "dpa0l", "dpa0u", "dpa1l", "dpa1u",
-+ "dpa2l", "dpa2u", "dpa3l", "dpa3u",
-+
-+ /* fpu system registers */
-+ "sr88", "sr89", "sr90", "sr91", "sr92", "sr93", "fpsr", "fpepc",
-+ "fpst", "fpcc", "fpcfg", "sr99", "sr100", "sr101", "sr102", "sr103",
-+ "sr104", "sr105", "sr106", "sr107", "sr108", "sr109", "sr110", "sr111",
-+ "sr112", "sr113", "sr114", "sr115"
-+ };
-+ if (regnum < 0 || regnum >= E_NUM_REGS)
-+ return NULL;
-+ return v850e2_reg_names[regnum];
-+}
-+
- /* Returns the default type for register N. */
-
- static struct type *
-@@ -827,7 +958,6 @@
- v850_alloc_frame_cache (struct frame_info *this_frame)
- {
- struct v850_frame_cache *cache;
-- int i;
-
- cache = FRAME_OBSTACK_ZALLOC (struct v850_frame_cache);
- cache->saved_regs = trad_frame_alloc_saved_regs (this_frame);
-@@ -894,7 +1024,7 @@
-
- /* Adjust all the saved registers such that they contain addresses
- instead of offsets. */
-- for (i = 0; i < E_NUM_REGS; i++)
-+ for (i = 0; i < gdbarch_num_regs (gdbarch); i++)
- if (trad_frame_addr_p (cache->saved_regs, i))
- cache->saved_regs[i].addr += cache->base;
-
-@@ -994,14 +1124,20 @@
- {
- case bfd_mach_v850:
- set_gdbarch_register_name (gdbarch, v850_register_name);
-+ set_gdbarch_num_regs (gdbarch, E_NUM_OF_V850_REGS);
- break;
- case bfd_mach_v850e:
- case bfd_mach_v850e1:
- set_gdbarch_register_name (gdbarch, v850e_register_name);
-+ set_gdbarch_num_regs (gdbarch, E_NUM_OF_V850E_REGS);
-+ break;
-+ case bfd_mach_v850e2:
-+ case bfd_mach_v850e2v3:
-+ set_gdbarch_register_name (gdbarch, v850e2_register_name);
-+ set_gdbarch_num_regs (gdbarch, E_NUM_REGS);
- break;
- }
-
-- set_gdbarch_num_regs (gdbarch, E_NUM_REGS);
- set_gdbarch_num_pseudo_regs (gdbarch, 0);
- set_gdbarch_sp_regnum (gdbarch, E_SP_REGNUM);
- set_gdbarch_pc_regnum (gdbarch, E_PC_REGNUM);
-diff -Naur gdb-7.4.1.orig/sim/common/gentmap.c gdb-7.4.1/sim/common/gentmap.c
---- gdb-7.4.1.orig/sim/common/gentmap.c 2006-11-07 20:29:59.000000000 +0100
-+++ gdb-7.4.1/sim/common/gentmap.c 2012-07-06 06:08:31.112853320 +0200
-@@ -2,6 +2,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
-
- struct tdefs {
- char *symbol;
-diff -Naur gdb-7.4.1.orig/sim/erc32/configure gdb-7.4.1/sim/erc32/configure
---- gdb-7.4.1.orig/sim/erc32/configure 2011-12-03 19:23:45.000000000 +0100
-+++ gdb-7.4.1/sim/erc32/configure 2012-07-06 06:08:31.114853355 +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
-@@ -722,6 +723,7 @@
- enable_sim_profile
- with_pkgversion
- with_bugurl
-+with_system_readline
- '
- ac_precious_vars='build_alias
- host_alias
-@@ -1364,6 +1366,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
-@@ -4737,86 +4740,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.
-@@ -4825,33 +4783,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.4.1.orig/sim/erc32/configure.ac gdb-7.4.1/sim/erc32/configure.ac
---- gdb-7.4.1.orig/sim/erc32/configure.ac 2011-10-18 02:30:57.000000000 +0200
-+++ gdb-7.4.1/sim/erc32/configure.ac 2012-07-06 06:08:31.117853406 +0200
-@@ -7,27 +7,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.4.1.orig/sim/erc32/erc32.c gdb-7.4.1/sim/erc32/erc32.c
---- gdb-7.4.1.orig/sim/erc32/erc32.c 2010-05-11 16:18:20.000000000 +0200
-+++ gdb-7.4.1/sim/erc32/erc32.c 2012-07-06 06:08:31.118853423 +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.4.1.orig/sim/erc32/Makefile.in gdb-7.4.1/sim/erc32/Makefile.in
---- gdb-7.4.1.orig/sim/erc32/Makefile.in 2012-01-06 05:54:43.000000000 +0100
-+++ gdb-7.4.1/sim/erc32/Makefile.in 2012-07-06 06:08:31.113853337 +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.4.1.orig/sim/h8300/compile.c gdb-7.4.1/sim/h8300/compile.c
---- gdb-7.4.1.orig/sim/h8300/compile.c 2011-07-05 21:06:37.000000000 +0200
-+++ gdb-7.4.1/sim/h8300/compile.c 2012-07-06 06:08:31.119853440 +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.4.1.orig/sim/m32c/Makefile.in gdb-7.4.1/sim/m32c/Makefile.in
---- gdb-7.4.1.orig/sim/m32c/Makefile.in 2012-01-06 05:54:51.000000000 +0100
-+++ gdb-7.4.1/sim/m32c/Makefile.in 2012-07-06 06:08:31.119853440 +0200
-@@ -55,7 +55,7 @@
- ./opc2c -l m32c.out $(srcdir)/m32c.opc > m32c.c
-
- opc2c : opc2c.o safe-fgets.o
-- $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) $^ -o $@ $(BUILD_LIBS)
-+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $^ -o $@ $(BUILD_LIBS)
-
- sample.x : $(srcdir)/sample.S $(srcdir)/sample.ld
- ../../gcc/xgcc $(CPUFLAGS) -B../../gcc/ -c $(srcdir)/sample.S -o sample.o
-@@ -89,8 +89,8 @@
- r8c.o : cpu.h mem.h misc.h int.h
-
- opc2c.o : opc2c.c safe-fgets.h
-- $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/opc2c.c
-+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/opc2c.c
-
- safe-fgets.o : safe-fgets.c safe-fgets.h
-- $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/safe-fgets.c
-+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/safe-fgets.c
-
-diff -Naur gdb-7.4.1.orig/sim/microblaze/ChangeLog gdb-7.4.1/sim/microblaze/ChangeLog
---- gdb-7.4.1.orig/sim/microblaze/ChangeLog 2011-12-03 19:23:49.000000000 +0100
-+++ gdb-7.4.1/sim/microblaze/ChangeLog 2012-07-06 06:08:31.120853457 +0200
-@@ -1,3 +1,8 @@
-+2012-04-29 Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+ * interp.c: Don't include <sys/times.h>, <netinet/in.h>.
-+ Define _POSIX on mingw32.
-+
- 2011-12-03 Mike Frysinger <vapier at gentoo.org>
-
- * aclocal.m4: New file.
-diff -Naur gdb-7.4.1.orig/sim/microblaze/interp.c gdb-7.4.1/sim/microblaze/interp.c
---- gdb-7.4.1.orig/sim/microblaze/interp.c 2012-01-06 05:54:54.000000000 +0100
-+++ gdb-7.4.1/sim/microblaze/interp.c 2012-07-06 06:08:31.120853457 +0200
-@@ -18,11 +18,13 @@
- Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
- 02110-1301, USA. */
-
-+#ifdef __MINGW32__
-+#define _POSIX
-+#endif
-+
- #include <signal.h>
- #include "sysdep.h"
--#include <sys/times.h>
- #include <sys/param.h>
--#include <netinet/in.h> /* for byte ordering macros */
- #include "bfd.h"
- #include "gdb/callback.h"
- #include "libiberty.h"
-diff -Naur gdb-7.4.1.orig/sim/ppc/device.c gdb-7.4.1/sim/ppc/device.c
---- gdb-7.4.1.orig/sim/ppc/device.c 2011-02-14 06:14:27.000000000 +0100
-+++ gdb-7.4.1/sim/ppc/device.c 2012-07-06 06:08:31.121853474 +0200
-@@ -1816,7 +1816,7 @@
- /* I/O */
-
- EXTERN_DEVICE\
--(void volatile)
-+(void)
- device_error(device *me,
- const char *fmt,
- ...)
-diff -Naur gdb-7.4.1.orig/sim/ppc/device.h gdb-7.4.1/sim/ppc/device.h
---- gdb-7.4.1.orig/sim/ppc/device.h 2001-12-14 01:22:12.000000000 +0100
-+++ gdb-7.4.1/sim/ppc/device.h 2012-07-06 06:08:31.121853474 +0200
-@@ -727,7 +727,7 @@
- */
-
- EXTERN_DEVICE\
--(void volatile) device_error
-+(void) device_error
- (device *me,
- const char *fmt,
- ...) __attribute__ ((format (printf, 2, 3)));
-diff -Naur gdb-7.4.1.orig/sim/ppc/hw_glue.c gdb-7.4.1/sim/ppc/hw_glue.c
---- gdb-7.4.1.orig/sim/ppc/hw_glue.c 1999-04-16 03:35:09.000000000 +0200
-+++ gdb-7.4.1/sim/ppc/hw_glue.c 2012-07-06 06:08:31.122853491 +0200
-@@ -194,13 +194,13 @@
- if (glue->sizeof_output == 0)
- device_error(me, "at least one reg property size must be nonzero");
- if (glue->sizeof_output % sizeof(unsigned_word) != 0)
-- device_error(me, "reg property size must be %d aligned", sizeof(unsigned_word));
-+ device_error(me, "reg property size must be %zd aligned", sizeof(unsigned_word));
- /* and the address */
- device_address_to_attach_address(device_parent(me),
- &unit.address, &glue->space, &glue->address,
- me);
- if (glue->address % (sizeof(unsigned_word) * max_nr_interrupts) != 0)
-- device_error(me, "reg property address must be %d aligned",
-+ device_error(me, "reg property address must be %zd aligned",
- sizeof(unsigned_word) * max_nr_interrupts);
- glue->nr_outputs = glue->sizeof_output / sizeof(unsigned_word);
- glue->output = zalloc(glue->sizeof_output);
diff --git a/patches/gdb-7.5-rtems4.11-20120928.diff b/patches/gdb-7.5-rtems4.11-20120928.diff
deleted file mode 100644
index 5d03a33..0000000
--- a/patches/gdb-7.5-rtems4.11-20120928.diff
+++ /dev/null
@@ -1,778 +0,0 @@
-diff -Naur gdb-7.5.orig/gdb/ChangeLog gdb-7.5/gdb/ChangeLog
---- gdb-7.5.orig/gdb/ChangeLog 2012-08-17 19:21:44.000000000 +0200
-+++ gdb-7.5/gdb/ChangeLog 2012-09-30 06:50:23.124729087 +0200
-@@ -101,6 +101,10 @@
- "set/show use-deprecated-index-sections".
- * main.c (captured_main): Delete --use-deprecated-index-sections.
-
-+2012-07-19 Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+ * symfile.c: Avoid bogus pointer to int cast.
-+
- 2012-07-18 Joel Brobecker <brobecker at adacore.com>
-
- * version.in: Set version to 7.4.91.20120718-cvs.
-diff -Naur gdb-7.5.orig/gdb/symfile.c gdb-7.5/gdb/symfile.c
---- gdb-7.5.orig/gdb/symfile.c 2012-06-26 22:14:02.000000000 +0200
-+++ gdb-7.5/gdb/symfile.c 2012-09-30 06:50:23.126729118 +0200
-@@ -2889,8 +2889,8 @@
- last_objfile_name);
- }
- fprintf_unfiltered (gdb_stdlog,
-- "Created symtab 0x%lx for module %s.\n",
-- (long) symtab, filename);
-+ "Created symtab 0x%p for module %s.\n",
-+ symtab, filename);
- }
-
- return (symtab);
-diff -Naur gdb-7.5.orig/libiberty/ChangeLog gdb-7.5/libiberty/ChangeLog
---- gdb-7.5.orig/libiberty/ChangeLog 2012-07-14 01:39:45.000000000 +0200
-+++ gdb-7.5/libiberty/ChangeLog 2012-09-30 06:50:23.128729149 +0200
-@@ -1,3 +1,8 @@
-+2012-07-31 Mike Frysinger <vapier at gentoo.org>
-+
-+ * md5.c (md5_finish_ctx): Declare swap_bytes. Assign SWAP() output
-+ to swap_bytes, and then call memcpy to move it to ctx->buffer.
-+
- 2012-07-13 Doug Evans <dje at google.com>
-
- * filename_cmp.c (filename_hash, filename_eq): New functions.
-diff -Naur gdb-7.5.orig/libiberty/md5.c gdb-7.5/libiberty/md5.c
---- gdb-7.5.orig/libiberty/md5.c 2011-09-23 22:01:11.000000000 +0200
-+++ gdb-7.5/libiberty/md5.c 2012-09-30 06:50:23.129729165 +0200
-@@ -103,6 +103,7 @@
- {
- /* Take yet unprocessed bytes into account. */
- md5_uint32 bytes = ctx->buflen;
-+ md5_uint32 swap_bytes;
- size_t pad;
-
- /* Now count remaining bytes. */
-@@ -113,10 +114,13 @@
- pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes;
- memcpy (&ctx->buffer[bytes], fillbuf, pad);
-
-- /* Put the 64-bit file length in *bits* at the end of the buffer. */
-- *(md5_uint32 *) &ctx->buffer[bytes + pad] = SWAP (ctx->total[0] << 3);
-- *(md5_uint32 *) &ctx->buffer[bytes + pad + 4] = SWAP ((ctx->total[1] << 3) |
-- (ctx->total[0] >> 29));
-+ /* Put the 64-bit file length in *bits* at the end of the buffer.
-+ Use memcpy to avoid aliasing problems. On most systems, this
-+ will be optimized away to the same code. */
-+ swap_bytes = SWAP (ctx->total[0] << 3);
-+ memcpy (&ctx->buffer[bytes + pad], &swap_bytes, sizeof (swap_bytes));
-+ swap_bytes = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
-+ memcpy (&ctx->buffer[bytes + pad + 4], &swap_bytes, sizeof (swap_bytes));
-
- /* Process last bytes. */
- md5_process_block (ctx->buffer, bytes + pad + 8, ctx);
-diff -Naur gdb-7.5.orig/sim/ChangeLog gdb-7.5/sim/ChangeLog
---- gdb-7.5.orig/sim/ChangeLog 2012-06-15 19:19:56.000000000 +0200
-+++ gdb-7.5/sim/ChangeLog 2012-09-30 06:50:23.130729180 +0200
-@@ -1,3 +1,8 @@
-+2012-07-19 Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+ * common/sim-events.c: Include <inttypes.h>.
-+ Avoid bogus pointer to int casts.
-+
- 2012-06-15 Joel Brobecker <brobecker at adacore.com>
-
- * configure: Regenerate.
-diff -Naur gdb-7.5.orig/sim/common/sim-events.c gdb-7.5/sim/common/sim-events.c
---- gdb-7.5.orig/sim/common/sim-events.c 2012-01-04 09:28:06.000000000 +0100
-+++ gdb-7.5/sim/common/sim-events.c 2012-09-30 06:50:23.131729196 +0200
-@@ -38,6 +38,8 @@
- #include <stdlib.h>
- #endif
-
-+#include <inttypes.h>
-+
- #include <signal.h> /* For SIGPROCMASK et al. */
-
- typedef enum {
-@@ -418,14 +420,14 @@
- event = event->next, i++)
- {
- ETRACE ((_ETRACE,
-- "event time-from-event - time %ld, delta %ld - event %d, tag 0x%lx, time %ld, handler 0x%lx, data 0x%lx%s%s\n",
-- (long)current_time,
-- (long)events->time_from_event,
-+ "event time-from-event - time %" PRId64 ", delta %" PRId64 " - event %d, tag 0x%p, time %" PRId64 ", handler 0x%p, data 0x%p%s%s\n",
-+ current_time,
-+ events->time_from_event,
- i,
-- (long)event,
-- (long)event->time_of_event,
-- (long)event->handler,
-- (long)event->data,
-+ event,
-+ event->time_of_event,
-+ event->handler,
-+ event->data,
- (event->trace != NULL) ? ", " : "",
- (event->trace != NULL) ? event->trace : ""));
- }
-@@ -525,12 +527,12 @@
- new_event->trace = NULL;
- insert_sim_event (sd, new_event, delta_time);
- ETRACE ((_ETRACE,
-- "event scheduled at %ld - tag 0x%lx - time %ld, handler 0x%lx, data 0x%lx%s%s\n",
-+ "event scheduled at %ld - tag 0x%p - time %ld, handler 0x%p, data 0x%p%s%s\n",
- (long)sim_events_time (sd),
-- (long)new_event,
-+ new_event,
- (long)new_event->time_of_event,
-- (long)new_event->handler,
-- (long)new_event->data,
-+ new_event->handler,
-+ new_event->data,
- (new_event->trace != NULL) ? ", " : "",
- (new_event->trace != NULL) ? new_event->trace : ""));
- return new_event;
-@@ -577,12 +579,12 @@
- #endif
-
- ETRACE ((_ETRACE,
-- "signal scheduled at %ld - tag 0x%lx - time %ld, handler 0x%lx, data 0x%lx\n",
-- (long)sim_events_time (sd),
-- (long)new_event,
-- (long)new_event->time_of_event,
-- (long)new_event->handler,
-- (long)new_event->data));
-+ "signal scheduled at %" PRId64 " - tag 0x%p - time %" PRId64 ", handler 0x%p, data 0x%p\n",
-+ sim_events_time (sd),
-+ new_event,
-+ new_event->time_of_event,
-+ new_event->handler,
-+ new_event->data));
- }
- #endif
-
-@@ -613,12 +615,12 @@
- events->watchpoints = new_event;
- events->work_pending = 1;
- ETRACE ((_ETRACE,
-- "event watching clock at %ld - tag 0x%lx - wallclock %ld, handler 0x%lx, data 0x%lx\n",
-- (long)sim_events_time (sd),
-- (long)new_event,
-- (long)new_event->wallclock,
-- (long)new_event->handler,
-- (long)new_event->data));
-+ "event watching clock at %" PRId64 " - tag 0x%p - wallclock %d, handler 0x%p, data 0x%p\n",
-+ sim_events_time (sd),
-+ new_event,
-+ new_event->wallclock,
-+ new_event->handler,
-+ new_event->data));
- return new_event;
- }
- #endif
-@@ -689,14 +691,14 @@
- events->watchpoints = new_event;
- events->work_pending = 1;
- ETRACE ((_ETRACE,
-- "event watching host at %ld - tag 0x%lx - host-addr 0x%lx, 0x%lx..0x%lx, handler 0x%lx, data 0x%lx\n",
-- (long)sim_events_time (sd),
-- (long)new_event,
-- (long)new_event->host_addr,
-- (long)new_event->lb,
-- (long)new_event->ub,
-- (long)new_event->handler,
-- (long)new_event->data));
-+ "event watching host at %" PRId64 " - tag 0x%p - host-addr 0x%p, 0x%x..0x%x, handler 0x%p, data 0x%p\n",
-+ sim_events_time (sd),
-+ new_event,
-+ new_event->host_addr,
-+ new_event->lb,
-+ new_event->ub,
-+ new_event->handler,
-+ new_event->data));
- return new_event;
- }
- #endif
-@@ -769,14 +771,14 @@
- events->watchpoints = new_event;
- events->work_pending = 1;
- ETRACE ((_ETRACE,
-- "event watching host at %ld - tag 0x%lx - host-addr 0x%lx, 0x%lx..0x%lx, handler 0x%lx, data 0x%lx\n",
-- (long)sim_events_time (sd),
-- (long)new_event,
-- (long)new_event->host_addr,
-- (long)new_event->lb,
-- (long)new_event->ub,
-- (long)new_event->handler,
-- (long)new_event->data));
-+ "event watching host at %" PRId64 " - tag 0x%p - host-addr 0x%p, 0x%x..0x%x, handler 0x%p, data 0x%p\n",
-+ sim_events_time (sd),
-+ new_event,
-+ new_event->host_addr,
-+ new_event->lb,
-+ new_event->ub,
-+ new_event->handler,
-+ new_event->data));
- return new_event;
- }
- #endif
-@@ -803,12 +805,12 @@
- sim_event *dead = *ptr_to_current;
- *ptr_to_current = dead->next;
- ETRACE ((_ETRACE,
-- "event/watch descheduled at %ld - tag 0x%lx - time %ld, handler 0x%lx, data 0x%lx%s%s\n",
-- (long) sim_events_time (sd),
-- (long) event_to_remove,
-- (long) dead->time_of_event,
-- (long) dead->handler,
-- (long) dead->data,
-+ "event/watch descheduled at %" PRId64 " - tag 0x%p - time %" PRId64 ", handler 0x%p, data 0x%p%s%s\n",
-+ sim_events_time (sd),
-+ event_to_remove,
-+ dead->time_of_event,
-+ dead->handler,
-+ dead->data,
- (dead->trace != NULL) ? ", " : "",
- (dead->trace != NULL) ? dead->trace : ""));
- sim_events_free (sd, dead);
-@@ -819,9 +821,9 @@
- }
- }
- ETRACE ((_ETRACE,
-- "event/watch descheduled at %ld - tag 0x%lx - not found\n",
-- (long) sim_events_time (sd),
-- (long) event_to_remove));
-+ "event/watch descheduled at %" PRId64 " - tag 0x%p - not found\n",
-+ sim_events_time (sd),
-+ event_to_remove));
- }
- #endif
-
-@@ -1146,11 +1148,11 @@
- sim_event_handler *handler = to_do->handler;
- void *data = to_do->data;
- ETRACE ((_ETRACE,
-- "event issued at %ld - tag 0x%lx - handler 0x%lx, data 0x%lx%s%s\n",
-- (long) event_time,
-- (long) to_do,
-- (long) handler,
-- (long) data,
-+ "event issued at %" PRId64 " - tag 0x%p - handler 0x%p, data 0x%p%s%s\n",
-+ event_time,
-+ to_do,
-+ handler,
-+ data,
- (to_do->trace != NULL) ? ", " : "",
- (to_do->trace != NULL) ? to_do->trace : ""));
- sim_events_free (sd, to_do);
-@@ -1174,11 +1176,11 @@
- events->queue = to_do->next;
- update_time_from_event (sd);
- ETRACE ((_ETRACE,
-- "event issued at %ld - tag 0x%lx - handler 0x%lx, data 0x%lx%s%s\n",
-- (long) event_time,
-- (long) to_do,
-- (long) handler,
-- (long) data,
-+ "event issued at %" PRId64 " - tag 0x%p - handler 0x%p, data 0x%p%s%s\n",
-+ event_time,
-+ to_do,
-+ handler,
-+ data,
- (to_do->trace != NULL) ? ", " : "",
- (to_do->trace != NULL) ? to_do->trace : ""));
- sim_events_free (sd, to_do);
-diff -Naur gdb-7.5.orig/sim/erc32/ChangeLog gdb-7.5/sim/erc32/ChangeLog
---- gdb-7.5.orig/sim/erc32/ChangeLog 2012-06-15 19:20:30.000000000 +0200
-+++ gdb-7.5/sim/erc32/ChangeLog 2012-09-30 06:50:23.131729196 +0200
-@@ -1,3 +1,18 @@
-+2012-08-16 Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+ * func.c, sis.c: Include <inttypes.h>.
-+ Apply PRI* macros to print 64 bit types.
-+ * sis.h: Include <stdint.h>.
-+ Derive 64 bit types from POSIX 64 types.
-+ Don't define UINT64_MAX if already defined.
-+
-+2012-07-20 Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+ * Makefile.in, configure.ac: Backport from rtems-4.11-gdb-7.4.1.
-+ Use system-readline. Fix EXEEXT handling.
-+ * erc32.c: Backport from rtems-4.11-gdb-7.4.1.
-+ * configure: Regenerate.
-+
- 2012-06-15 Joel Brobecker <brobecker at adacore.com>
-
- * sys.h: Include "config.h".
-diff -Naur gdb-7.5.orig/sim/erc32/configure gdb-7.5/sim/erc32/configure
---- gdb-7.5.orig/sim/erc32/configure 2012-06-15 19:20:00.000000000 +0200
-+++ gdb-7.5/sim/erc32/configure 2012-09-30 06:50:23.133729228 +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
-@@ -723,6 +724,7 @@
- enable_sim_profile
- with_pkgversion
- with_bugurl
-+with_system_readline
- '
- ac_precious_vars='build_alias
- host_alias
-@@ -1365,6 +1367,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
-@@ -4811,42 +4814,19 @@
- 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
-- # Keep in sync with gdb's configure.ac list.
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
--$as_echo_n "checking for library containing tgetent... " >&6; }
--if test "${ac_cv_search_tgetent+set}" = set; then :
-- $as_echo_n "(cached) " >&6
--else
-- ac_func_search_save_LIBS=$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.
-@@ -4855,65 +4835,20 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char tgetent ();
-+char add_history ();
- int
- main ()
- {
--return tgetent ();
-+return add_history ();
- ;
- return 0;
- }
- _ACEOF
--for ac_lib in '' termcap tinfo curses ncurses; do
-- if test -z "$ac_lib"; then
-- ac_res="none required"
-- else
-- ac_res=-l$ac_lib
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- fi
-- if ac_fn_c_try_link "$LINENO"; then :
-- ac_cv_search_tgetent=$ac_res
--fi
--rm -f core conftest.err conftest.$ac_objext \
-- conftest$ac_exeext
-- if test "${ac_cv_search_tgetent+set}" = set; then :
-- break
--fi
--done
--if test "${ac_cv_search_tgetent+set}" = set; then :
--
--else
-- ac_cv_search_tgetent=no
--fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tgetent" >&5
--$as_echo "$ac_cv_search_tgetent" >&6; }
--ac_res=$ac_cv_search_tgetent
--if test "$ac_res" != no; then :
-- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-- TERMCAP=$ac_cv_search_tgetent
--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
-+if ac_fn_c_try_link "$LINENO"; then :
-+ 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.
-@@ -4922,33 +4857,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.5.orig/sim/erc32/configure.ac gdb-7.5/sim/erc32/configure.ac
---- gdb-7.5.orig/sim/erc32/configure.ac 2011-12-31 08:06:47.000000000 +0100
-+++ gdb-7.5/sim/erc32/configure.ac 2012-09-30 06:50:23.134729243 +0200
-@@ -7,29 +7,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
-- # Keep in sync with gdb's configure.ac list.
-- AC_SEARCH_LIBS(tgetent, [termcap tinfo curses ncurses],
-- [TERMCAP=$ac_cv_search_tgetent], [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.5.orig/sim/erc32/erc32.c gdb-7.5/sim/erc32/erc32.c
---- gdb-7.5.orig/sim/erc32/erc32.c 2010-05-11 16:18:20.000000000 +0200
-+++ gdb-7.5/sim/erc32/erc32.c 2012-09-30 06:50:23.135729257 +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.5.orig/sim/erc32/func.c gdb-7.5/sim/erc32/func.c
---- gdb-7.5.orig/sim/erc32/func.c 2010-05-11 16:18:20.000000000 +0200
-+++ gdb-7.5/sim/erc32/func.c 2012-09-30 06:50:23.135729257 +0200
-@@ -25,6 +25,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <ctype.h>
-+#include <inttypes.h>
- #include "sis.h"
- #include "end.h"
- #include <dis-asm.h>
-@@ -640,8 +641,8 @@
- sregs->nbranch;
- #endif
-
-- printf("\n Cycles : %9d\n\r", ebase.simtime - sregs->simstart);
-- printf(" Instructions : %9d\n", sregs->ninst);
-+ printf("\n Cycles : %9" PRId64 "\n\r", ebase.simtime - sregs->simstart);
-+ printf(" Instructions : %9" PRId64 "\n", sregs->ninst);
-
- #ifdef STAT
- printf(" integer : %9.2f %%\n", 100.0 * (float) iinst / (float) sregs->ninst);
-@@ -671,8 +672,8 @@
- printf(" Processor utilisation : %5.2f %%\n", 100.0 * (1.0 - ((float) sregs->pwdtime / (float) stime)));
- printf(" Real-time / simulator-time : 1/%.2f \n",
- ((float) sregs->tottime) / ((float) (stime) / (sregs->freq * 1.0E6)));
-- printf(" Simulator performance : %d KIPS\n",sregs->ninst/tottime/1000);
-- printf(" Used time (sys + user) : %3d s\n\n", sregs->tottime);
-+ printf(" Simulator performance : %" PRId64 " KIPS\n",sregs->ninst/tottime/1000);
-+ printf(" Used time (sys + user) : %3" PRId64 " s\n\n", sregs->tottime);
- }
-
-
-diff -Naur gdb-7.5.orig/sim/erc32/Makefile.in gdb-7.5/sim/erc32/Makefile.in
---- gdb-7.5.orig/sim/erc32/Makefile.in 2012-01-04 09:28:09.000000000 +0100
-+++ gdb-7.5/sim/erc32/Makefile.in 2012-09-30 06:50:23.132729212 +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.5.orig/sim/erc32/sis.c gdb-7.5/sim/erc32/sis.c
---- gdb-7.5.orig/sim/erc32/sis.c 2010-05-11 16:18:20.000000000 +0200
-+++ gdb-7.5/sim/erc32/sis.c 2012-09-30 06:50:23.136729272 +0200
-@@ -28,6 +28,7 @@
- #endif
- #include <stdio.h>
- #include <time.h>
-+#include <inttypes.h>
- #include <sys/fcntl.h>
- #include "sis.h"
- #include <dis-asm.h>
-@@ -124,7 +125,7 @@
- sregs->histind = 0;
- }
- if (dis) {
-- printf(" %8u ", ebase.simtime);
-+ printf(" %8" PRIu64, ebase.simtime);
- dis_mem(sregs->pc, 1, &dinfo);
- }
- }
-@@ -279,7 +280,7 @@
- case CTRL_C:
- printf("\b\bInterrupt!\n");
- case TIME_OUT:
-- printf(" Stopped at time %d (%.3f ms)\n", ebase.simtime,
-+ printf(" Stopped at time %" PRId64 " (%.3f ms)\n", ebase.simtime,
- ((double) ebase.simtime / (double) sregs.freq) / 1000.0);
- break;
- case BPT_HIT:
-@@ -289,7 +290,7 @@
- case ERROR:
- printf("IU in error mode (%d)\n", sregs.trap);
- stat = 0;
-- printf(" %8d ", ebase.simtime);
-+ printf(" %8" PRId64, ebase.simtime);
- dis_mem(sregs.pc, 1, &dinfo);
- break;
- default:
-diff -Naur gdb-7.5.orig/sim/erc32/sis.h gdb-7.5/sim/erc32/sis.h
---- gdb-7.5.orig/sim/erc32/sis.h 2012-06-15 19:20:30.000000000 +0200
-+++ gdb-7.5/sim/erc32/sis.h 2012-09-30 06:50:23.136729272 +0200
-@@ -22,6 +22,8 @@
-
- #include "config.h"
- #include "ansidecl.h"
-+#include <stdint.h>
-+
- #include "gdb/callback.h"
- #include "gdb/remote-sim.h"
-
-@@ -53,10 +55,12 @@
- typedef double float64; /* 64-bit float */
-
- /* FIXME: what about host compilers that don't support 64-bit ints? */
--typedef unsigned long long uint64; /* 64-bit unsigned int */
--typedef long long int64; /* 64-bit signed int */
-+typedef uint64_t uint64; /* 64-bit unsigned int */
-+typedef int64_t int64; /* 64-bit signed int */
-
-+#ifndef UINT64_MAX
- #define UINT64_MAX 18446744073709551615ULL
-+#endif
-
- struct pstate {
-
-diff -Naur gdb-7.5.orig/sim/ppc/ChangeLog gdb-7.5/sim/ppc/ChangeLog
---- gdb-7.5.orig/sim/ppc/ChangeLog 2012-06-15 19:20:07.000000000 +0200
-+++ gdb-7.5/sim/ppc/ChangeLog 2012-09-30 06:50:23.144729398 +0200
-@@ -1,3 +1,10 @@
-+2012-09-28 Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+ Backport from gcc-7.4-rtems4.11:
-+
-+ * device.c, device.h: Use (void) device_error.
-+ * hw_glue.c: Use %zd to print sizes.
-+
- 2012-06-15 Joel Brobecker <brobecker at adacore.com>
-
- * configure: Regenerate.
-diff -Naur gdb-7.5.orig/sim/ppc/device.c gdb-7.5/sim/ppc/device.c
---- gdb-7.5.orig/sim/ppc/device.c 2011-02-14 06:14:27.000000000 +0100
-+++ gdb-7.5/sim/ppc/device.c 2012-09-30 06:50:23.145729413 +0200
-@@ -1816,7 +1816,7 @@
- /* I/O */
-
- EXTERN_DEVICE\
--(void volatile)
-+(void)
- device_error(device *me,
- const char *fmt,
- ...)
-diff -Naur gdb-7.5.orig/sim/ppc/device.h gdb-7.5/sim/ppc/device.h
---- gdb-7.5.orig/sim/ppc/device.h 2001-12-14 01:22:12.000000000 +0100
-+++ gdb-7.5/sim/ppc/device.h 2012-09-30 06:50:23.145729413 +0200
-@@ -727,7 +727,7 @@
- */
-
- EXTERN_DEVICE\
--(void volatile) device_error
-+(void) device_error
- (device *me,
- const char *fmt,
- ...) __attribute__ ((format (printf, 2, 3)));
-diff -Naur gdb-7.5.orig/sim/ppc/hw_glue.c gdb-7.5/sim/ppc/hw_glue.c
---- gdb-7.5.orig/sim/ppc/hw_glue.c 1999-04-16 03:35:09.000000000 +0200
-+++ gdb-7.5/sim/ppc/hw_glue.c 2012-09-30 06:50:23.146729429 +0200
-@@ -194,13 +194,13 @@
- if (glue->sizeof_output == 0)
- device_error(me, "at least one reg property size must be nonzero");
- if (glue->sizeof_output % sizeof(unsigned_word) != 0)
-- device_error(me, "reg property size must be %d aligned", sizeof(unsigned_word));
-+ device_error(me, "reg property size must be %zd aligned", sizeof(unsigned_word));
- /* and the address */
- device_address_to_attach_address(device_parent(me),
- &unit.address, &glue->space, &glue->address,
- me);
- if (glue->address % (sizeof(unsigned_word) * max_nr_interrupts) != 0)
-- device_error(me, "reg property address must be %d aligned",
-+ device_error(me, "reg property address must be %zd aligned",
- sizeof(unsigned_word) * max_nr_interrupts);
- glue->nr_outputs = glue->sizeof_output / sizeof(unsigned_word);
- glue->output = zalloc(glue->sizeof_output);
diff --git a/patches/gdb-7.5-rtems4.11-20121003.diff b/patches/gdb-7.5-rtems4.11-20121003.diff
deleted file mode 100644
index fa7aa93..0000000
--- a/patches/gdb-7.5-rtems4.11-20121003.diff
+++ /dev/null
@@ -1,833 +0,0 @@
-diff -Naur gdb-7.5.orig/gdb/ChangeLog gdb-7.5/gdb/ChangeLog
---- gdb-7.5.orig/gdb/ChangeLog 2012-08-17 19:21:44.000000000 +0200
-+++ gdb-7.5/gdb/ChangeLog 2012-10-03 05:13:35.925579962 +0200
-@@ -1,3 +1,9 @@
-+2012-08-21 Pierre Muller <muller at ics.u-strasbg.fr>
-+
-+ * symfile.c (allocate_symtab): Use host_address_to_string
-+ function instead of cast of pointer to long which is not
-+ compatible with x86_64-w64-mingw32 build.
-+
- 2012-08-17 Joel Brobecker <brobecker at adacore.com>
-
- * version.in: Update GDB version number to 7.5.
-diff -Naur gdb-7.5.orig/gdb/symfile.c gdb-7.5/gdb/symfile.c
---- gdb-7.5.orig/gdb/symfile.c 2012-06-26 22:14:02.000000000 +0200
-+++ gdb-7.5/gdb/symfile.c 2012-10-03 05:13:35.926579978 +0200
-@@ -2889,8 +2889,8 @@
- last_objfile_name);
- }
- fprintf_unfiltered (gdb_stdlog,
-- "Created symtab 0x%lx for module %s.\n",
-- (long) symtab, filename);
-+ "Created symtab %s for module %s.\n",
-+ host_address_to_string (symtab), filename);
- }
-
- return (symtab);
-diff -Naur gdb-7.5.orig/libiberty/ChangeLog gdb-7.5/libiberty/ChangeLog
---- gdb-7.5.orig/libiberty/ChangeLog 2012-07-14 01:39:45.000000000 +0200
-+++ gdb-7.5/libiberty/ChangeLog 2012-10-03 05:13:35.932580071 +0200
-@@ -1,3 +1,8 @@
-+2012-07-31 Mike Frysinger <vapier at gentoo.org>
-+
-+ * md5.c (md5_finish_ctx): Declare swap_bytes. Assign SWAP() output
-+ to swap_bytes, and then call memcpy to move it to ctx->buffer.
-+
- 2012-07-13 Doug Evans <dje at google.com>
-
- * filename_cmp.c (filename_hash, filename_eq): New functions.
-diff -Naur gdb-7.5.orig/libiberty/md5.c gdb-7.5/libiberty/md5.c
---- gdb-7.5.orig/libiberty/md5.c 2011-09-23 22:01:11.000000000 +0200
-+++ gdb-7.5/libiberty/md5.c 2012-10-03 05:13:35.933580087 +0200
-@@ -103,6 +103,7 @@
- {
- /* Take yet unprocessed bytes into account. */
- md5_uint32 bytes = ctx->buflen;
-+ md5_uint32 swap_bytes;
- size_t pad;
-
- /* Now count remaining bytes. */
-@@ -113,10 +114,13 @@
- pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes;
- memcpy (&ctx->buffer[bytes], fillbuf, pad);
-
-- /* Put the 64-bit file length in *bits* at the end of the buffer. */
-- *(md5_uint32 *) &ctx->buffer[bytes + pad] = SWAP (ctx->total[0] << 3);
-- *(md5_uint32 *) &ctx->buffer[bytes + pad + 4] = SWAP ((ctx->total[1] << 3) |
-- (ctx->total[0] >> 29));
-+ /* Put the 64-bit file length in *bits* at the end of the buffer.
-+ Use memcpy to avoid aliasing problems. On most systems, this
-+ will be optimized away to the same code. */
-+ swap_bytes = SWAP (ctx->total[0] << 3);
-+ memcpy (&ctx->buffer[bytes + pad], &swap_bytes, sizeof (swap_bytes));
-+ swap_bytes = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
-+ memcpy (&ctx->buffer[bytes + pad + 4], &swap_bytes, sizeof (swap_bytes));
-
- /* Process last bytes. */
- md5_process_block (ctx->buffer, bytes + pad + 8, ctx);
-diff -Naur gdb-7.5.orig/sim/ChangeLog gdb-7.5/sim/ChangeLog
---- gdb-7.5.orig/sim/ChangeLog 2012-06-15 19:19:56.000000000 +0200
-+++ gdb-7.5/sim/ChangeLog 2012-10-03 05:13:35.934580102 +0200
-@@ -1,3 +1,8 @@
-+2012-07-19 Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+ * common/sim-events.c: Include <inttypes.h>.
-+ Avoid bogus pointer to int casts.
-+
- 2012-06-15 Joel Brobecker <brobecker at adacore.com>
-
- * configure: Regenerate.
-diff -Naur gdb-7.5.orig/sim/common/sim-events.c gdb-7.5/sim/common/sim-events.c
---- gdb-7.5.orig/sim/common/sim-events.c 2012-01-04 09:28:06.000000000 +0100
-+++ gdb-7.5/sim/common/sim-events.c 2012-10-03 05:13:35.935580117 +0200
-@@ -38,6 +38,8 @@
- #include <stdlib.h>
- #endif
-
-+#include <inttypes.h>
-+
- #include <signal.h> /* For SIGPROCMASK et al. */
-
- typedef enum {
-@@ -418,14 +420,14 @@
- event = event->next, i++)
- {
- ETRACE ((_ETRACE,
-- "event time-from-event - time %ld, delta %ld - event %d, tag 0x%lx, time %ld, handler 0x%lx, data 0x%lx%s%s\n",
-- (long)current_time,
-- (long)events->time_from_event,
-+ "event time-from-event - time %" PRId64 ", delta %" PRId64 " - event %d, tag 0x%p, time %" PRId64 ", handler 0x%p, data 0x%p%s%s\n",
-+ current_time,
-+ events->time_from_event,
- i,
-- (long)event,
-- (long)event->time_of_event,
-- (long)event->handler,
-- (long)event->data,
-+ event,
-+ event->time_of_event,
-+ event->handler,
-+ event->data,
- (event->trace != NULL) ? ", " : "",
- (event->trace != NULL) ? event->trace : ""));
- }
-@@ -525,12 +527,12 @@
- new_event->trace = NULL;
- insert_sim_event (sd, new_event, delta_time);
- ETRACE ((_ETRACE,
-- "event scheduled at %ld - tag 0x%lx - time %ld, handler 0x%lx, data 0x%lx%s%s\n",
-+ "event scheduled at %ld - tag 0x%p - time %ld, handler 0x%p, data 0x%p%s%s\n",
- (long)sim_events_time (sd),
-- (long)new_event,
-+ new_event,
- (long)new_event->time_of_event,
-- (long)new_event->handler,
-- (long)new_event->data,
-+ new_event->handler,
-+ new_event->data,
- (new_event->trace != NULL) ? ", " : "",
- (new_event->trace != NULL) ? new_event->trace : ""));
- return new_event;
-@@ -577,12 +579,12 @@
- #endif
-
- ETRACE ((_ETRACE,
-- "signal scheduled at %ld - tag 0x%lx - time %ld, handler 0x%lx, data 0x%lx\n",
-- (long)sim_events_time (sd),
-- (long)new_event,
-- (long)new_event->time_of_event,
-- (long)new_event->handler,
-- (long)new_event->data));
-+ "signal scheduled at %" PRId64 " - tag 0x%p - time %" PRId64 ", handler 0x%p, data 0x%p\n",
-+ sim_events_time (sd),
-+ new_event,
-+ new_event->time_of_event,
-+ new_event->handler,
-+ new_event->data));
- }
- #endif
-
-@@ -613,12 +615,12 @@
- events->watchpoints = new_event;
- events->work_pending = 1;
- ETRACE ((_ETRACE,
-- "event watching clock at %ld - tag 0x%lx - wallclock %ld, handler 0x%lx, data 0x%lx\n",
-- (long)sim_events_time (sd),
-- (long)new_event,
-- (long)new_event->wallclock,
-- (long)new_event->handler,
-- (long)new_event->data));
-+ "event watching clock at %" PRId64 " - tag 0x%p - wallclock %d, handler 0x%p, data 0x%p\n",
-+ sim_events_time (sd),
-+ new_event,
-+ new_event->wallclock,
-+ new_event->handler,
-+ new_event->data));
- return new_event;
- }
- #endif
-@@ -689,14 +691,14 @@
- events->watchpoints = new_event;
- events->work_pending = 1;
- ETRACE ((_ETRACE,
-- "event watching host at %ld - tag 0x%lx - host-addr 0x%lx, 0x%lx..0x%lx, handler 0x%lx, data 0x%lx\n",
-- (long)sim_events_time (sd),
-- (long)new_event,
-- (long)new_event->host_addr,
-- (long)new_event->lb,
-- (long)new_event->ub,
-- (long)new_event->handler,
-- (long)new_event->data));
-+ "event watching host at %" PRId64 " - tag 0x%p - host-addr 0x%p, 0x%x..0x%x, handler 0x%p, data 0x%p\n",
-+ sim_events_time (sd),
-+ new_event,
-+ new_event->host_addr,
-+ new_event->lb,
-+ new_event->ub,
-+ new_event->handler,
-+ new_event->data));
- return new_event;
- }
- #endif
-@@ -769,14 +771,14 @@
- events->watchpoints = new_event;
- events->work_pending = 1;
- ETRACE ((_ETRACE,
-- "event watching host at %ld - tag 0x%lx - host-addr 0x%lx, 0x%lx..0x%lx, handler 0x%lx, data 0x%lx\n",
-- (long)sim_events_time (sd),
-- (long)new_event,
-- (long)new_event->host_addr,
-- (long)new_event->lb,
-- (long)new_event->ub,
-- (long)new_event->handler,
-- (long)new_event->data));
-+ "event watching host at %" PRId64 " - tag 0x%p - host-addr 0x%p, 0x%x..0x%x, handler 0x%p, data 0x%p\n",
-+ sim_events_time (sd),
-+ new_event,
-+ new_event->host_addr,
-+ new_event->lb,
-+ new_event->ub,
-+ new_event->handler,
-+ new_event->data));
- return new_event;
- }
- #endif
-@@ -803,12 +805,12 @@
- sim_event *dead = *ptr_to_current;
- *ptr_to_current = dead->next;
- ETRACE ((_ETRACE,
-- "event/watch descheduled at %ld - tag 0x%lx - time %ld, handler 0x%lx, data 0x%lx%s%s\n",
-- (long) sim_events_time (sd),
-- (long) event_to_remove,
-- (long) dead->time_of_event,
-- (long) dead->handler,
-- (long) dead->data,
-+ "event/watch descheduled at %" PRId64 " - tag 0x%p - time %" PRId64 ", handler 0x%p, data 0x%p%s%s\n",
-+ sim_events_time (sd),
-+ event_to_remove,
-+ dead->time_of_event,
-+ dead->handler,
-+ dead->data,
- (dead->trace != NULL) ? ", " : "",
- (dead->trace != NULL) ? dead->trace : ""));
- sim_events_free (sd, dead);
-@@ -819,9 +821,9 @@
- }
- }
- ETRACE ((_ETRACE,
-- "event/watch descheduled at %ld - tag 0x%lx - not found\n",
-- (long) sim_events_time (sd),
-- (long) event_to_remove));
-+ "event/watch descheduled at %" PRId64 " - tag 0x%p - not found\n",
-+ sim_events_time (sd),
-+ event_to_remove));
- }
- #endif
-
-@@ -1146,11 +1148,11 @@
- sim_event_handler *handler = to_do->handler;
- void *data = to_do->data;
- ETRACE ((_ETRACE,
-- "event issued at %ld - tag 0x%lx - handler 0x%lx, data 0x%lx%s%s\n",
-- (long) event_time,
-- (long) to_do,
-- (long) handler,
-- (long) data,
-+ "event issued at %" PRId64 " - tag 0x%p - handler 0x%p, data 0x%p%s%s\n",
-+ event_time,
-+ to_do,
-+ handler,
-+ data,
- (to_do->trace != NULL) ? ", " : "",
- (to_do->trace != NULL) ? to_do->trace : ""));
- sim_events_free (sd, to_do);
-@@ -1174,11 +1176,11 @@
- events->queue = to_do->next;
- update_time_from_event (sd);
- ETRACE ((_ETRACE,
-- "event issued at %ld - tag 0x%lx - handler 0x%lx, data 0x%lx%s%s\n",
-- (long) event_time,
-- (long) to_do,
-- (long) handler,
-- (long) data,
-+ "event issued at %" PRId64 " - tag 0x%p - handler 0x%p, data 0x%p%s%s\n",
-+ event_time,
-+ to_do,
-+ handler,
-+ data,
- (to_do->trace != NULL) ? ", " : "",
- (to_do->trace != NULL) ? to_do->trace : ""));
- sim_events_free (sd, to_do);
-diff -Naur gdb-7.5.orig/sim/erc32/ChangeLog gdb-7.5/sim/erc32/ChangeLog
---- gdb-7.5.orig/sim/erc32/ChangeLog 2012-06-15 19:20:30.000000000 +0200
-+++ gdb-7.5/sim/erc32/ChangeLog 2012-10-03 05:13:35.935580117 +0200
-@@ -1,3 +1,18 @@
-+2012-08-16 Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+ * func.c, sis.c: Include <inttypes.h>.
-+ Apply PRI* macros to print 64 bit types.
-+ * sis.h: Include <stdint.h>.
-+ Derive 64 bit types from POSIX 64 types.
-+ Don't define UINT64_MAX if already defined.
-+
-+2012-07-20 Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+ * Makefile.in, configure.ac: Backport from rtems-4.11-gdb-7.4.1.
-+ Use system-readline. Fix EXEEXT handling.
-+ * erc32.c: Backport from rtems-4.11-gdb-7.4.1.
-+ * configure: Regenerate.
-+
- 2012-06-15 Joel Brobecker <brobecker at adacore.com>
-
- * sys.h: Include "config.h".
-diff -Naur gdb-7.5.orig/sim/erc32/configure gdb-7.5/sim/erc32/configure
---- gdb-7.5.orig/sim/erc32/configure 2012-06-15 19:20:00.000000000 +0200
-+++ gdb-7.5/sim/erc32/configure 2012-10-03 05:13:35.938580164 +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
-@@ -723,6 +724,7 @@
- enable_sim_profile
- with_pkgversion
- with_bugurl
-+with_system_readline
- '
- ac_precious_vars='build_alias
- host_alias
-@@ -1365,6 +1367,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
-@@ -4811,42 +4814,19 @@
- 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
-- # Keep in sync with gdb's configure.ac list.
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
--$as_echo_n "checking for library containing tgetent... " >&6; }
--if test "${ac_cv_search_tgetent+set}" = set; then :
-- $as_echo_n "(cached) " >&6
--else
-- ac_func_search_save_LIBS=$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.
-@@ -4855,65 +4835,20 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char tgetent ();
-+char add_history ();
- int
- main ()
- {
--return tgetent ();
-+return add_history ();
- ;
- return 0;
- }
- _ACEOF
--for ac_lib in '' termcap tinfo curses ncurses; do
-- if test -z "$ac_lib"; then
-- ac_res="none required"
-- else
-- ac_res=-l$ac_lib
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- fi
-- if ac_fn_c_try_link "$LINENO"; then :
-- ac_cv_search_tgetent=$ac_res
--fi
--rm -f core conftest.err conftest.$ac_objext \
-- conftest$ac_exeext
-- if test "${ac_cv_search_tgetent+set}" = set; then :
-- break
--fi
--done
--if test "${ac_cv_search_tgetent+set}" = set; then :
--
--else
-- ac_cv_search_tgetent=no
--fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tgetent" >&5
--$as_echo "$ac_cv_search_tgetent" >&6; }
--ac_res=$ac_cv_search_tgetent
--if test "$ac_res" != no; then :
-- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-- TERMCAP=$ac_cv_search_tgetent
--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
-+if ac_fn_c_try_link "$LINENO"; then :
-+ 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.
-@@ -4922,33 +4857,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.5.orig/sim/erc32/configure.ac gdb-7.5/sim/erc32/configure.ac
---- gdb-7.5.orig/sim/erc32/configure.ac 2011-12-31 08:06:47.000000000 +0100
-+++ gdb-7.5/sim/erc32/configure.ac 2012-10-03 05:13:35.938580164 +0200
-@@ -7,29 +7,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
-- # Keep in sync with gdb's configure.ac list.
-- AC_SEARCH_LIBS(tgetent, [termcap tinfo curses ncurses],
-- [TERMCAP=$ac_cv_search_tgetent], [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.5.orig/sim/erc32/erc32.c gdb-7.5/sim/erc32/erc32.c
---- gdb-7.5.orig/sim/erc32/erc32.c 2010-05-11 16:18:20.000000000 +0200
-+++ gdb-7.5/sim/erc32/erc32.c 2012-10-03 05:13:35.939580180 +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.5.orig/sim/erc32/func.c gdb-7.5/sim/erc32/func.c
---- gdb-7.5.orig/sim/erc32/func.c 2010-05-11 16:18:20.000000000 +0200
-+++ gdb-7.5/sim/erc32/func.c 2012-10-03 05:13:35.939580180 +0200
-@@ -25,6 +25,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <ctype.h>
-+#include <inttypes.h>
- #include "sis.h"
- #include "end.h"
- #include <dis-asm.h>
-@@ -640,8 +641,8 @@
- sregs->nbranch;
- #endif
-
-- printf("\n Cycles : %9d\n\r", ebase.simtime - sregs->simstart);
-- printf(" Instructions : %9d\n", sregs->ninst);
-+ printf("\n Cycles : %9" PRId64 "\n\r", ebase.simtime - sregs->simstart);
-+ printf(" Instructions : %9" PRId64 "\n", sregs->ninst);
-
- #ifdef STAT
- printf(" integer : %9.2f %%\n", 100.0 * (float) iinst / (float) sregs->ninst);
-@@ -671,8 +672,8 @@
- printf(" Processor utilisation : %5.2f %%\n", 100.0 * (1.0 - ((float) sregs->pwdtime / (float) stime)));
- printf(" Real-time / simulator-time : 1/%.2f \n",
- ((float) sregs->tottime) / ((float) (stime) / (sregs->freq * 1.0E6)));
-- printf(" Simulator performance : %d KIPS\n",sregs->ninst/tottime/1000);
-- printf(" Used time (sys + user) : %3d s\n\n", sregs->tottime);
-+ printf(" Simulator performance : %" PRId64 " KIPS\n",sregs->ninst/tottime/1000);
-+ printf(" Used time (sys + user) : %3" PRId64 " s\n\n", sregs->tottime);
- }
-
-
-diff -Naur gdb-7.5.orig/sim/erc32/Makefile.in gdb-7.5/sim/erc32/Makefile.in
---- gdb-7.5.orig/sim/erc32/Makefile.in 2012-01-04 09:28:09.000000000 +0100
-+++ gdb-7.5/sim/erc32/Makefile.in 2012-10-03 05:13:35.936580132 +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.5.orig/sim/erc32/sis.c gdb-7.5/sim/erc32/sis.c
---- gdb-7.5.orig/sim/erc32/sis.c 2010-05-11 16:18:20.000000000 +0200
-+++ gdb-7.5/sim/erc32/sis.c 2012-10-03 05:13:35.940580196 +0200
-@@ -28,6 +28,7 @@
- #endif
- #include <stdio.h>
- #include <time.h>
-+#include <inttypes.h>
- #include <sys/fcntl.h>
- #include "sis.h"
- #include <dis-asm.h>
-@@ -124,7 +125,7 @@
- sregs->histind = 0;
- }
- if (dis) {
-- printf(" %8u ", ebase.simtime);
-+ printf(" %8" PRIu64, ebase.simtime);
- dis_mem(sregs->pc, 1, &dinfo);
- }
- }
-@@ -279,7 +280,7 @@
- case CTRL_C:
- printf("\b\bInterrupt!\n");
- case TIME_OUT:
-- printf(" Stopped at time %d (%.3f ms)\n", ebase.simtime,
-+ printf(" Stopped at time %" PRId64 " (%.3f ms)\n", ebase.simtime,
- ((double) ebase.simtime / (double) sregs.freq) / 1000.0);
- break;
- case BPT_HIT:
-@@ -289,7 +290,7 @@
- case ERROR:
- printf("IU in error mode (%d)\n", sregs.trap);
- stat = 0;
-- printf(" %8d ", ebase.simtime);
-+ printf(" %8" PRId64, ebase.simtime);
- dis_mem(sregs.pc, 1, &dinfo);
- break;
- default:
-diff -Naur gdb-7.5.orig/sim/erc32/sis.h gdb-7.5/sim/erc32/sis.h
---- gdb-7.5.orig/sim/erc32/sis.h 2012-06-15 19:20:30.000000000 +0200
-+++ gdb-7.5/sim/erc32/sis.h 2012-10-03 05:13:35.940580196 +0200
-@@ -22,6 +22,8 @@
-
- #include "config.h"
- #include "ansidecl.h"
-+#include <stdint.h>
-+
- #include "gdb/callback.h"
- #include "gdb/remote-sim.h"
-
-@@ -53,10 +55,12 @@
- typedef double float64; /* 64-bit float */
-
- /* FIXME: what about host compilers that don't support 64-bit ints? */
--typedef unsigned long long uint64; /* 64-bit unsigned int */
--typedef long long int64; /* 64-bit signed int */
-+typedef uint64_t uint64; /* 64-bit unsigned int */
-+typedef int64_t int64; /* 64-bit signed int */
-
-+#ifndef UINT64_MAX
- #define UINT64_MAX 18446744073709551615ULL
-+#endif
-
- struct pstate {
-
-diff -Naur gdb-7.5.orig/sim/microblaze/ChangeLog gdb-7.5/sim/microblaze/ChangeLog
---- gdb-7.5.orig/sim/microblaze/ChangeLog 2012-06-15 19:20:04.000000000 +0200
-+++ gdb-7.5/sim/microblaze/ChangeLog 2012-10-03 05:13:35.940580196 +0200
-@@ -1,3 +1,17 @@
-+2012-10-02 Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+ * interp.c: Define SIGBUS, SIGTRAP, SIGQUIT on mingw32.
-+ Extend comment on _POSIX/__MINGW32__.
-+
-+2012-10-02 Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+ Backport from rtems-4.11-gdb-7.4:
-+
-+ 2012-04-29 Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+ * interp.c: Don't include <sys/times.h>, <netinet/in.h>.
-+ Define _POSIX on mingw32.
-+
- 2012-06-15 Joel Brobecker <brobecker at adacore.com>
-
- * config.in, configure: Regenerate.
-diff -Naur gdb-7.5.orig/sim/microblaze/interp.c gdb-7.5/sim/microblaze/interp.c
---- gdb-7.5.orig/sim/microblaze/interp.c 2012-06-06 23:50:03.000000000 +0200
-+++ gdb-7.5/sim/microblaze/interp.c 2012-10-03 05:13:35.941580211 +0200
-@@ -19,11 +19,29 @@
- 02110-1301, USA. */
-
- #include "config.h"
-+
-+#ifdef __MINGW32__
-+/* mingw-w64 defines the SIG* defines if _POSIX is defined */
-+#define _POSIX
-+#endif
-+
- #include <signal.h>
-+
-+#ifdef __MINGW32__
-+#ifndef SIGTRAP
-+#define SIGTRAP 5
-+#endif
-+#ifndef SIGBUS
-+#define SIGBUS 10
-+#endif
-+#ifndef SIGQUIT
-+#define SIGQUIT 3
-+#endif
-+#endif
-+
- #include "sysdep.h"
--#include <sys/times.h>
- #include <sys/param.h>
--#include <netinet/in.h> /* for byte ordering macros */
-+
- #include "bfd.h"
- #include "gdb/callback.h"
- #include "libiberty.h"
-diff -Naur gdb-7.5.orig/sim/ppc/ChangeLog gdb-7.5/sim/ppc/ChangeLog
---- gdb-7.5.orig/sim/ppc/ChangeLog 2012-06-15 19:20:07.000000000 +0200
-+++ gdb-7.5/sim/ppc/ChangeLog 2012-10-03 05:13:35.942580226 +0200
-@@ -1,3 +1,10 @@
-+2012-09-28 Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+ Backport from gcc-7.4-rtems4.11:
-+
-+ * device.c, device.h: Use (void) device_error.
-+ * hw_glue.c: Use %zd to print sizes.
-+
- 2012-06-15 Joel Brobecker <brobecker at adacore.com>
-
- * configure: Regenerate.
-diff -Naur gdb-7.5.orig/sim/ppc/device.c gdb-7.5/sim/ppc/device.c
---- gdb-7.5.orig/sim/ppc/device.c 2011-02-14 06:14:27.000000000 +0100
-+++ gdb-7.5/sim/ppc/device.c 2012-10-03 05:13:35.943580241 +0200
-@@ -1816,7 +1816,7 @@
- /* I/O */
-
- EXTERN_DEVICE\
--(void volatile)
-+(void)
- device_error(device *me,
- const char *fmt,
- ...)
-diff -Naur gdb-7.5.orig/sim/ppc/device.h gdb-7.5/sim/ppc/device.h
---- gdb-7.5.orig/sim/ppc/device.h 2001-12-14 01:22:12.000000000 +0100
-+++ gdb-7.5/sim/ppc/device.h 2012-10-03 05:13:35.944580256 +0200
-@@ -727,7 +727,7 @@
- */
-
- EXTERN_DEVICE\
--(void volatile) device_error
-+(void) device_error
- (device *me,
- const char *fmt,
- ...) __attribute__ ((format (printf, 2, 3)));
-diff -Naur gdb-7.5.orig/sim/ppc/hw_glue.c gdb-7.5/sim/ppc/hw_glue.c
---- gdb-7.5.orig/sim/ppc/hw_glue.c 1999-04-16 03:35:09.000000000 +0200
-+++ gdb-7.5/sim/ppc/hw_glue.c 2012-10-03 05:13:35.944580256 +0200
-@@ -194,13 +194,13 @@
- if (glue->sizeof_output == 0)
- device_error(me, "at least one reg property size must be nonzero");
- if (glue->sizeof_output % sizeof(unsigned_word) != 0)
-- device_error(me, "reg property size must be %d aligned", sizeof(unsigned_word));
-+ device_error(me, "reg property size must be %zd aligned", sizeof(unsigned_word));
- /* and the address */
- device_address_to_attach_address(device_parent(me),
- &unit.address, &glue->space, &glue->address,
- me);
- if (glue->address % (sizeof(unsigned_word) * max_nr_interrupts) != 0)
-- device_error(me, "reg property address must be %d aligned",
-+ device_error(me, "reg property address must be %zd aligned",
- sizeof(unsigned_word) * max_nr_interrupts);
- glue->nr_outputs = glue->sizeof_output / sizeof(unsigned_word);
- glue->output = zalloc(glue->sizeof_output);
More information about the vc
mailing list