diff -Naur gdb-6.8.50.20090629.orig/bfd/sysdep.h gdb-6.8.50.20090629/bfd/sysdep.h --- gdb-6.8.50.20090629.orig/bfd/sysdep.h 2007-07-03 16:26:42.000000000 +0200 +++ gdb-6.8.50.20090629/bfd/sysdep.h 2009-06-29 08:21:53.000000000 +0200 @@ -136,7 +136,7 @@ #endif #if !HAVE_DECL_STRSTR -extern char *strstr (); +/* extern char *strstr (); */ #endif #ifdef HAVE_FTELLO diff -Naur gdb-6.8.50.20090629.orig/gdb/lm32-tdep.c gdb-6.8.50.20090629/gdb/lm32-tdep.c --- gdb-6.8.50.20090629.orig/gdb/lm32-tdep.c 2009-06-17 20:43:24.000000000 +0200 +++ gdb-6.8.50.20090629/gdb/lm32-tdep.c 2009-06-29 18:03:28.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-6.8.50.20090629.orig/sim/erc32/configure gdb-6.8.50.20090629/sim/erc32/configure --- gdb-6.8.50.20090629.orig/sim/erc32/configure 2008-07-11 04:35:40.000000000 +0200 +++ gdb-6.8.50.20090629/sim/erc32/configure 2009-06-29 08:37:17.000000000 +0200 @@ -309,7 +309,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS sim_environment sim_alignment sim_assert sim_bitsize sim_endian sim_hostendian sim_float sim_scache sim_default_model sim_hw_cflags sim_hw_objs sim_hw sim_inline sim_packages sim_regparm sim_reserved_bits sim_smp sim_stdcall sim_xor_endian WARN_CFLAGS WERROR_CFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC_FOR_BUILD HDEFINES AR RANLIB ac_ct_RANLIB USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT CPP EGREP MAINT sim_bswap sim_cflags sim_debug sim_stdio sim_trace sim_profile PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI TERMCAP READLINE cgen_breaks LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS sim_environment sim_alignment sim_assert sim_bitsize sim_endian sim_hostendian sim_float sim_scache sim_default_model sim_hw_cflags sim_hw_objs sim_hw sim_inline sim_packages sim_regparm sim_reserved_bits sim_smp sim_stdcall sim_xor_endian WARN_CFLAGS WERROR_CFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC_FOR_BUILD HDEFINES AR RANLIB ac_ct_RANLIB USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT CPP EGREP MAINT sim_bswap sim_cflags sim_debug sim_stdio sim_trace sim_profile PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI READLINE READLINE_DEPS READLINE_CFLAGS cgen_breaks LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -863,6 +863,7 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --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 @@ -1509,8 +1510,7 @@ # Test for GNAT. # We require the gnatbind program, and a compiler driver that -# understands Ada. We use the user's CC setting, already found, -# and possibly add $1 to the command-line parameters. +# understands Ada. We use the user's CC setting, already found. # # Sets the shell variable have_gnat to yes or no as appropriate, and # substitutes GNATBIND and GNATMAKE. @@ -1537,8 +1537,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. @@ -4940,57 +4938,36 @@ done -# In the Cygwin environment, we need some additional flags. -echo "$as_me:$LINENO: checking for cygwin" >&5 -echo $ECHO_N "checking for cygwin... $ECHO_C" >&6 -if test "${sim_cv_os_cygwin+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 -fi -rm -f conftest* +# Check whether --with-system-readline or --without-system-readline was given. +if test "${with_system_readline+set}" = set; then + withval="$with_system_readline" -fi -echo "$as_me:$LINENO: result: $sim_cv_os_cygwin" >&5 -echo "${ECHO_T}$sim_cv_os_cygwin" >&6 +fi; -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 - echo "$as_me:$LINENO: checking for main in -ltermcap" >&5 -echo $ECHO_N "checking for main in -ltermcap... $ECHO_C" >&6 -if test "${ac_cv_lib_termcap_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ltermcap $LIBS" -cat >conftest.$ac_ext <<_ACEOF +if test "$with_system_readline" = yes; then + echo "$as_me:$LINENO: checking for readline" >&5 +echo $ECHO_N "checking for readline... $ECHO_C" >&6 + save_LIBS="$LIBS" + LIBS="-lreadline $save_LIBS" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char add_history (); int main () { -main (); +add_history (); ; return 0; } @@ -5017,41 +4994,13 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_termcap_main=yes + READLINE=-lreadline else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_termcap_main=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5 -echo "${ECHO_T}$ac_cv_lib_termcap_main" >&6 -if test $ac_cv_lib_termcap_main = 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 - echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 -echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 -if test "${ac_cv_lib_readline_readline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lreadline $TERMCAP $LIBS" -cat >conftest.$ac_ext <<_ACEOF + LIBS="-lreadline -lncurses $save_LIBS" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5064,11 +5013,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char readline (); +char add_history (); int main () { -readline (); +add_history (); ; return 0; } @@ -5095,28 +5044,34 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_readline_readline=yes + READLINE="-lreadline -lncurses" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_readline_readline=no +{ { echo "$as_me:$LINENO: error: unable to detect readline" >&5 +echo "$as_me: error: unable to detect readline" >&2;} + { (exit 1); exit 1; }; } fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + fi -echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 -echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 -if test $ac_cv_lib_readline_readline = yes; then - READLINE=-lreadline -else - { { echo "$as_me:$LINENO: error: the required \"readline\" library is missing" >&5 -echo "$as_me: error: the required \"readline\" library is missing" >&2;} - { (exit 1); exit 1; }; } +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$save_LIBS" + echo "$as_me:$LINENO: result: $READLINE" >&5 +echo "${ECHO_T}$READLINE" >&6 + READLINE_DEPS= + READLINE_CFLAGS= +else + READLINE='$(READLINE_DIR)/libreadline.a' + READLINE_DEPS='$(READLINE)' + READLINE_CFLAGS='-I$(READLINE_SRC)/..' fi -fi + + ac_sources="$sim_link_files" @@ -5839,8 +5794,9 @@ s,@PKGVERSION@,$PKGVERSION,;t t s,@REPORT_BUGS_TO@,$REPORT_BUGS_TO,;t t s,@REPORT_BUGS_TEXI@,$REPORT_BUGS_TEXI,;t t -s,@TERMCAP@,$TERMCAP,;t t s,@READLINE@,$READLINE,;t t +s,@READLINE_DEPS@,$READLINE_DEPS,;t t +s,@READLINE_CFLAGS@,$READLINE_CFLAGS,;t t s,@cgen_breaks@,$cgen_breaks,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t diff -Naur gdb-6.8.50.20090629.orig/sim/erc32/configure.ac gdb-6.8.50.20090629/sim/erc32/configure.ac --- gdb-6.8.50.20090629.orig/sim/erc32/configure.ac 2006-12-20 23:35:51.000000000 +0100 +++ gdb-6.8.50.20090629/sim/erc32/configure.ac 2009-06-29 08:36:57.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_DIR)/libreadline.a' + 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-6.8.50.20090629.orig/sim/erc32/erc32.c gdb-6.8.50.20090629/sim/erc32/erc32.c --- gdb-6.8.50.20090629.orig/sim/erc32/erc32.c 2008-11-11 23:20:54.000000000 +0100 +++ gdb-6.8.50.20090629/sim/erc32/erc32.c 2009-06-29 08:36:42.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-6.8.50.20090629.orig/sim/erc32/Makefile.in gdb-6.8.50.20090629/sim/erc32/Makefile.in --- gdb-6.8.50.20090629.orig/sim/erc32/Makefile.in 2009-01-14 11:53:07.000000000 +0100 +++ gdb-6.8.50.20090629/sim/erc32/Makefile.in 2009-06-29 08:36:26.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-6.8.50.20090629.orig/sim/h8300/compile.c gdb-6.8.50.20090629/sim/h8300/compile.c --- gdb-6.8.50.20090629.orig/sim/h8300/compile.c 2008-12-01 17:10:45.000000000 +0100 +++ gdb-6.8.50.20090629/sim/h8300/compile.c 2009-06-29 08:35:53.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-6.8.50.20090629.orig/sim/lm32/Makefile.in gdb-6.8.50.20090629/sim/lm32/Makefile.in --- gdb-6.8.50.20090629.orig/sim/lm32/Makefile.in 2009-05-18 15:25:35.000000000 +0200 +++ gdb-6.8.50.20090629/sim/lm32/Makefile.in 2009-06-29 17:54:41.000000000 +0200 @@ -39,6 +39,8 @@ arch.o: arch.c $(SIM_MAIN_DEPS) +traps.o: traps.c targ-vals.h $(SIM_MAIN_DEPS) + sim-if.o: sim-if.c $(SIM_MAIN_DEPS) $(srcdir)/../common/sim-core.h LM32BF_INCLUDE_DEPS = \ diff -Naur gdb-6.8.50.20090629.orig/sim/m32c/Makefile.in gdb-6.8.50.20090629/sim/m32c/Makefile.in --- gdb-6.8.50.20090629.orig/sim/m32c/Makefile.in 2009-01-14 11:53:07.000000000 +0100 +++ gdb-6.8.50.20090629/sim/m32c/Makefile.in 2009-06-29 08:36:06.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