source: rtems/contrib/crossrpms/patches/gdb-7.0.1-rtems4.10-20091222.diff @ 444f532

4.104.11
Last change on this file since 444f532 was 444f532, checked in by Ralf Corsepius <ralf.corsepius@…>, on Dec 22, 2009 at 4:30:54 PM

New.

  • Property mode set to 100644
File size: 21.0 KB
  • gdb/config.in

    diff -Naur gdb-7.0.1.orig/gdb/config.in gdb-7.0.1/gdb/config.in
    old new  
    792792/* Define to `int' if <sys/types.h> does not define. */
    793793#undef pid_t
    794794
     795/* readline-6.0 started to use different name. */
     796#undef readline_echoing_p
     797
    795798/* Define to the equivalent of the C99 'restrict' keyword, or to
    796799   nothing if this is not supported.  Do not define if restrict is
    797800   supported directly.  */
  • gdb/configure

    diff -Naur gdb-7.0.1.orig/gdb/configure gdb-7.0.1/gdb/configure
    old new  
    84318431  READLINE=-lreadline
    84328432  READLINE_DEPS=
    84338433  READLINE_CFLAGS=
     8434
     8435  # readline-6.0 started to use the name `_rl_echoing_p'.
     8436  # `$(READLINE_DIR)/' of bundled readline would not resolve in configure.
     8437
     8438  echo "$as_me:$LINENO: checking for readline_echoing_p" >&5
     8439echo $ECHO_N "checking for readline_echoing_p... $ECHO_C" >&6
     8440  save_LIBS=$LIBS
     8441  LIBS="$LIBS $READLINE"
     8442  cat >conftest.$ac_ext <<_ACEOF
     8443/* confdefs.h.  */
     8444_ACEOF
     8445cat confdefs.h >>conftest.$ac_ext
     8446cat >>conftest.$ac_ext <<_ACEOF
     8447/* end confdefs.h.  */
     8448
     8449int
     8450main ()
     8451{
     8452extern int readline_echoing_p;
     8453                                    return readline_echoing_p;
     8454  ;
     8455  return 0;
     8456}
     8457_ACEOF
     8458rm -f conftest.$ac_objext conftest$ac_exeext
     8459if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     8460  (eval $ac_link) 2>conftest.er1
     8461  ac_status=$?
     8462  grep -v '^ *+' conftest.er1 >conftest.err
     8463  rm -f conftest.er1
     8464  cat conftest.err >&5
     8465  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     8466  (exit $ac_status); } &&
     8467         { ac_try='test -z "$ac_c_werror_flag"
     8468                         || test ! -s conftest.err'
     8469  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     8470  (eval $ac_try) 2>&5
     8471  ac_status=$?
     8472  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     8473  (exit $ac_status); }; } &&
     8474         { ac_try='test -s conftest$ac_exeext'
     8475  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     8476  (eval $ac_try) 2>&5
     8477  ac_status=$?
     8478  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     8479  (exit $ac_status); }; }; then
     8480  READLINE_ECHOING_P=yes
     8481else
     8482  echo "$as_me: failed program was:" >&5
     8483sed 's/^/| /' conftest.$ac_ext >&5
     8484
     8485READLINE_ECHOING_P=no
     8486
     8487cat >>confdefs.h <<\_ACEOF
     8488#define readline_echoing_p _rl_echoing_p
     8489_ACEOF
     8490
     8491fi
     8492rm -f conftest.err conftest.$ac_objext \
     8493      conftest$ac_exeext conftest.$ac_ext
     8494  LIBS="$save_LIBS"
     8495  echo "$as_me:$LINENO: result: $READLINE_ECHOING_P" >&5
     8496echo "${ECHO_T}$READLINE_ECHOING_P" >&6
    84348497else
    84358498  READLINE='$(READLINE_DIR)/libreadline.a'
    84368499  READLINE_DEPS='$(READLINE)'
  • gdb/configure.ac

    diff -Naur gdb-7.0.1.orig/gdb/configure.ac gdb-7.0.1/gdb/configure.ac
    old new  
    534534  READLINE=-lreadline
    535535  READLINE_DEPS=
    536536  READLINE_CFLAGS=
     537
     538  # readline-6.0 started to use the name `_rl_echoing_p'.
     539  # `$(READLINE_DIR)/' of bundled readline would not resolve in configure.
     540
     541  AC_MSG_CHECKING([for readline_echoing_p])
     542  save_LIBS=$LIBS
     543  LIBS="$LIBS $READLINE"
     544  AC_LINK_IFELSE(AC_LANG_PROGRAM(,[[extern int readline_echoing_p;
     545                                    return readline_echoing_p;]]),
     546                 [READLINE_ECHOING_P=yes],
     547                 [READLINE_ECHOING_P=no
     548                  AC_DEFINE([readline_echoing_p], [_rl_echoing_p],
     549                            [readline-6.0 started to use different name.])])
     550  LIBS="$save_LIBS"
     551  AC_MSG_RESULT([$READLINE_ECHOING_P])
    537552else
    538553  READLINE='$(READLINE_DIR)/libreadline.a'
    539554  READLINE_DEPS='$(READLINE)'
  • gdb/lm32-tdep.c

    diff -Naur gdb-7.0.1.orig/gdb/lm32-tdep.c gdb-7.0.1/gdb/lm32-tdep.c
    old new  
    3535#include "regcache.h"
    3636#include "trad-frame.h"
    3737#include "reggroups.h"
    38 #include "opcodes/lm32-desc.h"
     38#include "../opcodes/lm32-desc.h"
    3939
    4040#include "gdb_string.h"
    4141
  • gdb/sparc-tdep.c

    diff -Naur gdb-7.0.1.orig/gdb/sparc-tdep.c gdb-7.0.1/gdb/sparc-tdep.c
    old new  
    11001100sparc32_store_return_value (struct type *type, struct regcache *regcache,
    11011101                            const gdb_byte *valbuf)
    11021102{
    1103   int len = TYPE_LENGTH (type);
     1103  size_t len = TYPE_LENGTH (type);
    11041104  gdb_byte buf[8];
    11051105
    11061106  gdb_assert (!sparc_structure_or_union_p (type));
  • sim/common/Make-common.in

    diff -Naur gdb-7.0.1.orig/sim/common/Make-common.in gdb-7.0.1/sim/common/Make-common.in
    old new  
    5252tooldir = $(libdir)/$(target_alias)
    5353
    5454datadir = @datadir@
     55datarootdir = @datarootdir@
    5556mandir = @mandir@
    5657man1dir = $(mandir)/man1
    5758infodir = @infodir@
  • sim/erc32/configure

    diff -Naur gdb-7.0.1.orig/sim/erc32/configure gdb-7.0.1/sim/erc32/configure
    old new  
    591591ac_subst_vars='LTLIBOBJS
    592592LIBOBJS
    593593cgen_breaks
     594READLINE_CFLAGS
     595READLINE_DEPS
    594596READLINE
    595 TERMCAP
    596597REPORT_BUGS_TEXI
    597598REPORT_BUGS_TO
    598599PKGVERSION
     
    715716enable_sim_profile
    716717with_pkgversion
    717718with_bugurl
     719with_system_readline
    718720'
    719721      ac_precious_vars='build_alias
    720722host_alias
     
    13561358  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
    13571359  --with-pkgversion=PKG   Use PKG in the version string in place of "GDB"
    13581360  --with-bugurl=URL       Direct users to URL to report a bug
     1361  --with-system-readline  use installed readline library
    13591362
    13601363Some influential environment variables:
    13611364  CC          C compiler command
     
    24112414
    24122415
    24132416
    2414 
    24152417# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
    24162418# it by inlining the macro's contents.
    24172419# This file contains common code used by all simulators.
     
    29112913int
    29122914main ()
    29132915{
    2914 
     2916return 0;
    29152917  ;
    29162918  return 0;
    29172919}
    29182920_ACEOF
    29192921ac_clean_files_save=$ac_clean_files
    2920 ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
     2922ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
    29212923# Try to create an executable without -o first, disregard a.out.
    29222924# It will help us diagnose broken compilers, and finding out an intuition
    29232925# of exeext.
    2924 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
    2925 $as_echo_n "checking for C compiler default output file name... " >&6; }
     2926{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
     2927$as_echo_n "checking whether the C compiler works... " >&6; }
    29262928ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
    29272929
    29282930# The possible output files:
     
    29842986else
    29852987  ac_file=''
    29862988fi
    2987 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
    2988 $as_echo "$ac_file" >&6; }
    29892989if test -z "$ac_file"; then :
    2990   $as_echo "$as_me: failed program was:" >&5
     2990  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     2991$as_echo "no" >&6; }
     2992$as_echo "$as_me: failed program was:" >&5
    29912993sed 's/^/| /' conftest.$ac_ext >&5
    29922994
    29932995{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     
    29952997{ as_fn_set_status 77
    29962998as_fn_error "C compiler cannot create executables
    29972999See \`config.log' for more details." "$LINENO" 5; }; }
     3000else
     3001  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     3002$as_echo "yes" >&6; }
    29983003fi
     3004{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
     3005$as_echo_n "checking for C compiler default output file name... " >&6; }
     3006{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
     3007$as_echo "$ac_file" >&6; }
    29993008ac_exeext=$ac_cv_exeext
    30003009
    3001 # Check that the compiler produces executables we can run.  If not, either
    3002 # the compiler is broken, or we cross compile.
    3003 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
    3004 $as_echo_n "checking whether the C compiler works... " >&6; }
    3005 # If not cross compiling, check that we can run a simple program.
    3006 if test "$cross_compiling" != yes; then
    3007   if { ac_try='./$ac_file'
    3008   { { case "(($ac_try" in
    3009   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    3010   *) ac_try_echo=$ac_try;;
    3011 esac
    3012 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
    3013 $as_echo "$ac_try_echo"; } >&5
    3014   (eval "$ac_try") 2>&5
    3015   ac_status=$?
    3016   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    3017   test $ac_status = 0; }; }; then
    3018     cross_compiling=no
    3019   else
    3020     if test "$cross_compiling" = maybe; then
    3021         cross_compiling=yes
    3022     else
    3023         { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    3024 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3025 as_fn_error "cannot run C compiled programs.
    3026 If you meant to cross compile, use \`--host'.
    3027 See \`config.log' for more details." "$LINENO" 5; }
    3028     fi
    3029   fi
    3030 fi
    3031 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    3032 $as_echo "yes" >&6; }
    3033 
    3034 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
     3010rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
    30353011ac_clean_files=$ac_clean_files_save
    3036 # Check that the compiler produces executables we can run.  If not, either
    3037 # the compiler is broken, or we cross compile.
    3038 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
    3039 $as_echo_n "checking whether we are cross compiling... " >&6; }
    3040 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
    3041 $as_echo "$cross_compiling" >&6; }
    3042 
    30433012{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
    30443013$as_echo_n "checking for suffix of executables... " >&6; }
    30453014if { { ac_try="$ac_link"
     
    30793048rm -f conftest.$ac_ext
    30803049EXEEXT=$ac_cv_exeext
    30813050ac_exeext=$EXEEXT
     3051cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3052/* end confdefs.h.  */
     3053
     3054int
     3055main ()
     3056{
     3057
     3058  ;
     3059  return 0;
     3060}
     3061_ACEOF
     3062ac_clean_files="$ac_clean_files conftest.out"
     3063# Check that the compiler produces executables we can run.  If not, either
     3064# the compiler is broken, or we cross compile.
     3065{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
     3066$as_echo_n "checking whether we are cross compiling... " >&6; }
     3067if test "$cross_compiling" != yes; then
     3068  { { ac_try="$ac_link"
     3069case "(($ac_try" in
     3070  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     3071  *) ac_try_echo=$ac_try;;
     3072esac
     3073eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     3074$as_echo "$ac_try_echo"; } >&5
     3075  (eval "$ac_link") 2>&5
     3076  ac_status=$?
     3077  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     3078  test $ac_status = 0; }
     3079  if { ac_try='./conftest$ac_cv_exeext'
     3080  { { case "(($ac_try" in
     3081  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     3082  *) ac_try_echo=$ac_try;;
     3083esac
     3084eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     3085$as_echo "$ac_try_echo"; } >&5
     3086  (eval "$ac_try") 2>&5
     3087  ac_status=$?
     3088  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     3089  test $ac_status = 0; }; }; then
     3090    cross_compiling=no
     3091  else
     3092    if test "$cross_compiling" = maybe; then
     3093        cross_compiling=yes
     3094    else
     3095        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     3096$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     3097as_fn_error "cannot run C compiled programs.
     3098If you meant to cross compile, use \`--host'.
     3099See \`config.log' for more details." "$LINENO" 5; }
     3100    fi
     3101  fi
     3102fi
     3103{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
     3104$as_echo "$cross_compiling" >&6; }
     3105
     3106rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
     3107ac_clean_files=$ac_clean_files_save
    30823108{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
    30833109$as_echo_n "checking for suffix of object files... " >&6; }
    30843110if test "${ac_cv_objext+set}" = set; then :
     
    45104536done
    45114537
    45124538
    4513 # In the Cygwin environment, we need some additional flags.
    4514 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cygwin" >&5
    4515 $as_echo_n "checking for cygwin... " >&6; }
    4516 if test "${sim_cv_os_cygwin+set}" = set; then :
    4517   $as_echo_n "(cached) " >&6
    4518 else
    4519   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    4520 /* end confdefs.h.  */
    45214539
    4522 #ifdef __CYGWIN__
    4523 lose
    4524 #endif
    4525 _ACEOF
    4526 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    4527   $EGREP "lose" >/dev/null 2>&1; then :
    4528   sim_cv_os_cygwin=yes
    4529 else
    4530   sim_cv_os_cygwin=no
     4540# Check whether --with-system-readline was given.
     4541if test "${with_system_readline+set}" = set; then :
     4542  withval=$with_system_readline;
    45314543fi
    4532 rm -f conftest*
    45334544
    4534 fi
    4535 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_cv_os_cygwin" >&5
    4536 $as_echo "$sim_cv_os_cygwin" >&6; }
    45374545
    4538 if test x$sim_cv_os_cygwin = xyes; then
    4539   TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32'
    4540 else
    4541   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ltermcap" >&5
    4542 $as_echo_n "checking for main in -ltermcap... " >&6; }
    4543 if test "${ac_cv_lib_termcap_main+set}" = set; then :
    4544   $as_echo_n "(cached) " >&6
    4545 else
    4546   ac_check_lib_save_LIBS=$LIBS
    4547 LIBS="-ltermcap  $LIBS"
    4548 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     4546if test "$with_system_readline" = yes; then
     4547  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline" >&5
     4548$as_echo_n "checking for readline... " >&6; }
     4549  save_LIBS="$LIBS"
     4550  LIBS="-lreadline $save_LIBS"
     4551  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    45494552/* end confdefs.h.  */
    45504553
    4551 
     4554/* Override any GCC internal prototype to avoid an error.
     4555   Use char because int might match the return type of a GCC
     4556   builtin and then its argument prototype would still apply.  */
     4557#ifdef __cplusplus
     4558extern "C"
     4559#endif
     4560char add_history ();
    45524561int
    45534562main ()
    45544563{
    4555 return main ();
     4564return add_history ();
    45564565  ;
    45574566  return 0;
    45584567}
    45594568_ACEOF
    45604569if ac_fn_c_try_link "$LINENO"; then :
    4561   ac_cv_lib_termcap_main=yes
    4562 else
    4563   ac_cv_lib_termcap_main=no
    4564 fi
    4565 rm -f core conftest.err conftest.$ac_objext \
    4566     conftest$ac_exeext conftest.$ac_ext
    4567 LIBS=$ac_check_lib_save_LIBS
    4568 fi
    4569 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_main" >&5
    4570 $as_echo "$ac_cv_lib_termcap_main" >&6; }
    4571 if test "x$ac_cv_lib_termcap_main" = x""yes; then :
    4572   TERMCAP=-ltermcap
    4573 else
    4574   TERMCAP=""
    4575 fi
    4576 
    4577 fi
    4578 
    4579 
    4580 # We prefer the in-tree readline.  Top-level dependencies make sure
    4581 # src/readline (if it's there) is configured before src/sim.
    4582 if test -r ../../readline/Makefile; then
    4583   READLINE=../../readline/libreadline.a
    4584 else
    4585   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
    4586 $as_echo_n "checking for readline in -lreadline... " >&6; }
    4587 if test "${ac_cv_lib_readline_readline+set}" = set; then :
    4588   $as_echo_n "(cached) " >&6
     4570  READLINE=-lreadline
    45894571else
    4590   ac_check_lib_save_LIBS=$LIBS
    4591 LIBS="-lreadline $TERMCAP $LIBS"
    4592 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     4572   LIBS="-lreadline -lncurses $save_LIBS"
     4573      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    45934574/* end confdefs.h.  */
    45944575
    45954576/* Override any GCC internal prototype to avoid an error.
     
    45984579#ifdef __cplusplus
    45994580extern "C"
    46004581#endif
    4601 char readline ();
     4582char add_history ();
    46024583int
    46034584main ()
    46044585{
    4605 return readline ();
     4586return add_history ();
    46064587  ;
    46074588  return 0;
    46084589}
    46094590_ACEOF
    46104591if ac_fn_c_try_link "$LINENO"; then :
    4611   ac_cv_lib_readline_readline=yes
     4592  READLINE="-lreadline -lncurses"
    46124593else
    4613   ac_cv_lib_readline_readline=no
     4594  as_fn_error "unable to detect readline" "$LINENO" 5
    46144595fi
    46154596rm -f core conftest.err conftest.$ac_objext \
    46164597    conftest$ac_exeext conftest.$ac_ext
    4617 LIBS=$ac_check_lib_save_LIBS
     4598
    46184599fi
    4619 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
    4620 $as_echo "$ac_cv_lib_readline_readline" >&6; }
    4621 if test "x$ac_cv_lib_readline_readline" = x""yes; then :
    4622   READLINE=-lreadline
    4623 else
    4624   as_fn_error "the required \"readline\" library is missing" "$LINENO" 5
     4600rm -f core conftest.err conftest.$ac_objext \
     4601    conftest$ac_exeext conftest.$ac_ext
     4602  LIBS="$save_LIBS"
     4603  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE" >&5
     4604$as_echo "$READLINE" >&6; }
     4605  READLINE_DEPS=
     4606  READLINE_CFLAGS=
     4607else
     4608  READLINE='../../readline/libreadline.a -lncurses'
     4609  READLINE_DEPS='$(READLINE)'
     4610  READLINE_CFLAGS='-I$(READLINE_SRC)/..'
    46254611fi
    46264612
    4627 fi
     4613
     4614
    46284615
    46294616
    46304617ac_sources="$sim_link_files"
  • sim/erc32/configure.ac

    diff -Naur gdb-7.0.1.orig/sim/erc32/configure.ac gdb-7.0.1/sim/erc32/configure.ac
    old new  
    1111
    1212AC_CHECK_HEADERS(stdlib.h)
    1313
    14 # In the Cygwin environment, we need some additional flags.
    15 AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin,
    16 [AC_EGREP_CPP(lose, [
    17 #ifdef __CYGWIN__
    18 lose
    19 #endif],[sim_cv_os_cygwin=yes],[sim_cv_os_cygwin=no])])
     14AC_ARG_WITH([system-readline],
     15  [AS_HELP_STRING([--with-system-readline],
     16                  [use installed readline library])])
    2017
    21 if test x$sim_cv_os_cygwin = xyes; then
    22   TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32'
     18if test "$with_system_readline" = yes; then
     19  AC_MSG_CHECKING([for readline])
     20  save_LIBS="$LIBS"
     21  LIBS="-lreadline $save_LIBS"
     22  AC_LINK_IFELSE([AC_LANG_CALL([],
     23    [add_history])], [READLINE=-lreadline],
     24    [ LIBS="-lreadline -lncurses $save_LIBS"
     25      AC_LINK_IFELSE([AC_LANG_CALL([],
     26        [add_history])], [READLINE="-lreadline -lncurses"],
     27        [AC_MSG_ERROR([unable to detect readline])])
     28    ])
     29  LIBS="$save_LIBS"
     30  AC_MSG_RESULT($READLINE)
     31  READLINE_DEPS=
     32  READLINE_CFLAGS=
    2333else
    24   AC_CHECK_LIB(termcap, main, TERMCAP=-ltermcap, TERMCAP="")
    25 fi
    26 AC_SUBST(TERMCAP)
    27 
    28 # We prefer the in-tree readline.  Top-level dependencies make sure
    29 # src/readline (if it's there) is configured before src/sim.
    30 if test -r ../../readline/Makefile; then
    31   READLINE=../../readline/libreadline.a
    32 else
    33   AC_CHECK_LIB(readline, readline, READLINE=-lreadline,
    34                AC_ERROR([the required "readline" library is missing]), $TERMCAP)
     34  READLINE='../../readline/libreadline.a -lncurses'
     35  READLINE_DEPS='$(READLINE)'
     36  READLINE_CFLAGS='-I$(READLINE_SRC)/..'
    3537fi
    3638AC_SUBST(READLINE)
     39AC_SUBST(READLINE_DEPS)
     40AC_SUBST(READLINE_CFLAGS)
     41
    3742SIM_AC_OUTPUT
  • sim/erc32/erc32.c

    diff -Naur gdb-7.0.1.orig/sim/erc32/erc32.c gdb-7.0.1/sim/erc32/erc32.c
    old new  
    414414    if (rom8) mec_memcfg &= ~0x20000;
    415415    else mec_memcfg |= 0x20000;
    416416
    417     mem_ramsz = (256 * 1024) << ((mec_memcfg >> 10) & 7);
     417    mem_ramsz = (512 * 1024) << ((mec_memcfg >> 10) & 7);
    418418    mem_romsz = (128 * 1024) << ((mec_memcfg >> 18) & 7);
    419419
    420420    if (sparclite_board) {
  • sim/erc32/Makefile.in

    diff -Naur gdb-7.0.1.orig/sim/erc32/Makefile.in gdb-7.0.1/sim/erc32/Makefile.in
    old new  
    1919
    2020## COMMON_PRE_CONFIG_FRAG
    2121
    22 TERMCAP_LIB = @TERMCAP@
     22# TERMCAP_LIB = -lncurses
    2323READLINE_LIB = @READLINE@
    2424
    2525SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
    2626SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
    27 SIM_EXTRA_ALL = sis
     27SIM_EXTRA_ALL = sis$(EXEEXT)
    2828SIM_EXTRA_INSTALL = install-sis
    2929SIM_EXTRA_CLEAN = clean-sis
    3030
     
    3838# `sis' doesn't need interf.o.
    3939SIS_OFILES = exec.o erc32.o func.o help.o float.o
    4040
    41 sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
    42         $(CC) $(ALL_CFLAGS) -o sis \
     41sis$(EXEEXT): sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
     42        $(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \
    4343          sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS)
    4444
    4545# FIXME: This computes the build host's endianness, doesn't it?
     
    5252
    5353# Copy the files into directories where they will be run.
    5454install-sis: installdirs
    55         n=`echo sis | sed '$(program_transform_name)'`; \
    56         $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
     55        n=`echo sis$(EXEEXT) | sed '$(program_transform_name)'`; \
     56        $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n
    5757
    5858clean-sis:
    59         rm -f sis end end.h
     59        rm -f sis$(EXEEXT) end end.h
    6060
    6161configure:
    6262        @echo "Rebuilding configure..."
  • sim/h8300/compile.c

    diff -Naur gdb-7.0.1.orig/sim/h8300/compile.c gdb-7.0.1/sim/h8300/compile.c
    old new  
    3838# define SIGTRAP 5
    3939#endif
    4040
     41#ifdef _WIN32
     42#ifndef SIGBUS
     43#define SIGBUS 10
     44#endif
     45#endif
     46
    4147int debug;
    4248
    4349host_callback *sim_callback;
  • sim/m32c/Makefile.in

    diff -Naur gdb-7.0.1.orig/sim/m32c/Makefile.in gdb-7.0.1/sim/m32c/Makefile.in
    old new  
    5555        ./opc2c -l m32c.out $(srcdir)/m32c.opc > m32c.c
    5656
    5757opc2c : opc2c.o safe-fgets.o
    58         $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
     58        $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $^ -o $@
    5959
    6060sample.x : $(srcdir)/sample.S $(srcdir)/sample.ld
    6161        ../../gcc/xgcc $(CPUFLAGS) -B../../gcc/ -c $(srcdir)/sample.S -o sample.o
     
    8383mem.o : mem.h cpu.h syscalls.h
    8484misc.o : cpu.h misc.h
    8585opc2c.o : safe-fgets.h
     86        $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/opc2c.c
    8687reg.o : cpu.h
    8788safe-fgets.o : safe-fgets.h
     89        $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/safe-fgets.c
    8890srcdest.c : cpu.h mem.h
    8991syscalls.c : cpu.h mem.h syscalls.h
    9092
Note: See TracBrowser for help on using the repository browser.