mirror of
https://gitlab.rtems.org/rtems/rtos/rtems.git
synced 2025-12-05 15:15:44 +00:00
Add Fedora's gdb-readline-6.0.patch
This commit is contained in:
Ralf Corsepius
666
contrib/crossrpms/patches/gdb-6.8.91-rtems4.10-20090926.diff
Normal file
666
contrib/crossrpms/patches/gdb-6.8.91-rtems4.10-20090926.diff
Normal file
@@ -0,0 +1,666 @@
|
|||||||
|
diff -Naur gdb-6.8.91.orig/bfd/sysdep.h gdb-6.8.91-rtems4.10-20090926/bfd/sysdep.h
|
||||||
|
--- gdb-6.8.91.orig/bfd/sysdep.h 2009-09-02 09:18:37.000000000 +0200
|
||||||
|
+++ gdb-6.8.91-rtems4.10-20090926/bfd/sysdep.h 2009-09-26 07:47:29.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.91.orig/gdb/config.in gdb-6.8.91-rtems4.10-20090926/gdb/config.in
|
||||||
|
--- gdb-6.8.91.orig/gdb/config.in 2009-08-22 18:56:42.000000000 +0200
|
||||||
|
+++ gdb-6.8.91-rtems4.10-20090926/gdb/config.in 2009-09-26 07:47:29.000000000 +0200
|
||||||
|
@@ -792,6 +792,9 @@
|
||||||
|
/* Define to `int' if <sys/types.h> does not define. */
|
||||||
|
#undef pid_t
|
||||||
|
|
||||||
|
+/* readline-6.0 started to use different name. */
|
||||||
|
+#undef readline_echoing_p
|
||||||
|
+
|
||||||
|
/* Define to the equivalent of the C99 'restrict' keyword, or to
|
||||||
|
nothing if this is not supported. Do not define if restrict is
|
||||||
|
supported directly. */
|
||||||
|
diff -Naur gdb-6.8.91.orig/gdb/configure gdb-6.8.91-rtems4.10-20090926/gdb/configure
|
||||||
|
--- gdb-6.8.91.orig/gdb/configure 2009-09-10 05:59:37.000000000 +0200
|
||||||
|
+++ gdb-6.8.91-rtems4.10-20090926/gdb/configure 2009-09-26 07:47:29.000000000 +0200
|
||||||
|
@@ -8431,6 +8431,69 @@
|
||||||
|
READLINE=-lreadline
|
||||||
|
READLINE_DEPS=
|
||||||
|
READLINE_CFLAGS=
|
||||||
|
+
|
||||||
|
+ # readline-6.0 started to use the name `_rl_echoing_p'.
|
||||||
|
+ # `$(READLINE_DIR)/' of bundled readline would not resolve in configure.
|
||||||
|
+
|
||||||
|
+ echo "$as_me:$LINENO: checking for readline_echoing_p" >&5
|
||||||
|
+echo $ECHO_N "checking for readline_echoing_p... $ECHO_C" >&6
|
||||||
|
+ save_LIBS=$LIBS
|
||||||
|
+ LIBS="$LIBS $READLINE"
|
||||||
|
+ cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
+/* confdefs.h. */
|
||||||
|
+_ACEOF
|
||||||
|
+cat confdefs.h >>conftest.$ac_ext
|
||||||
|
+cat >>conftest.$ac_ext <<_ACEOF
|
||||||
|
+/* end confdefs.h. */
|
||||||
|
+
|
||||||
|
+int
|
||||||
|
+main ()
|
||||||
|
+{
|
||||||
|
+extern int readline_echoing_p;
|
||||||
|
+ return readline_echoing_p;
|
||||||
|
+ ;
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+_ACEOF
|
||||||
|
+rm -f conftest.$ac_objext conftest$ac_exeext
|
||||||
|
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||||
|
+ (eval $ac_link) 2>conftest.er1
|
||||||
|
+ ac_status=$?
|
||||||
|
+ grep -v '^ *+' conftest.er1 >conftest.err
|
||||||
|
+ rm -f conftest.er1
|
||||||
|
+ cat conftest.err >&5
|
||||||
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
+ (exit $ac_status); } &&
|
||||||
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
||||||
|
+ || test ! -s conftest.err'
|
||||||
|
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||||
|
+ (eval $ac_try) 2>&5
|
||||||
|
+ ac_status=$?
|
||||||
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
+ (exit $ac_status); }; } &&
|
||||||
|
+ { ac_try='test -s conftest$ac_exeext'
|
||||||
|
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||||
|
+ (eval $ac_try) 2>&5
|
||||||
|
+ ac_status=$?
|
||||||
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
+ (exit $ac_status); }; }; then
|
||||||
|
+ READLINE_ECHOING_P=yes
|
||||||
|
+else
|
||||||
|
+ echo "$as_me: failed program was:" >&5
|
||||||
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
+
|
||||||
|
+READLINE_ECHOING_P=no
|
||||||
|
+
|
||||||
|
+cat >>confdefs.h <<\_ACEOF
|
||||||
|
+#define readline_echoing_p _rl_echoing_p
|
||||||
|
+_ACEOF
|
||||||
|
+
|
||||||
|
+fi
|
||||||
|
+rm -f conftest.err conftest.$ac_objext \
|
||||||
|
+ conftest$ac_exeext conftest.$ac_ext
|
||||||
|
+ LIBS="$save_LIBS"
|
||||||
|
+ echo "$as_me:$LINENO: result: $READLINE_ECHOING_P" >&5
|
||||||
|
+echo "${ECHO_T}$READLINE_ECHOING_P" >&6
|
||||||
|
else
|
||||||
|
READLINE='$(READLINE_DIR)/libreadline.a'
|
||||||
|
READLINE_DEPS='$(READLINE)'
|
||||||
|
diff -Naur gdb-6.8.91.orig/gdb/configure.ac gdb-6.8.91-rtems4.10-20090926/gdb/configure.ac
|
||||||
|
--- gdb-6.8.91.orig/gdb/configure.ac 2009-09-10 05:59:36.000000000 +0200
|
||||||
|
+++ gdb-6.8.91-rtems4.10-20090926/gdb/configure.ac 2009-09-26 07:47:29.000000000 +0200
|
||||||
|
@@ -534,6 +534,21 @@
|
||||||
|
READLINE=-lreadline
|
||||||
|
READLINE_DEPS=
|
||||||
|
READLINE_CFLAGS=
|
||||||
|
+
|
||||||
|
+ # readline-6.0 started to use the name `_rl_echoing_p'.
|
||||||
|
+ # `$(READLINE_DIR)/' of bundled readline would not resolve in configure.
|
||||||
|
+
|
||||||
|
+ AC_MSG_CHECKING([for readline_echoing_p])
|
||||||
|
+ save_LIBS=$LIBS
|
||||||
|
+ LIBS="$LIBS $READLINE"
|
||||||
|
+ AC_LINK_IFELSE(AC_LANG_PROGRAM(,[[extern int readline_echoing_p;
|
||||||
|
+ return readline_echoing_p;]]),
|
||||||
|
+ [READLINE_ECHOING_P=yes],
|
||||||
|
+ [READLINE_ECHOING_P=no
|
||||||
|
+ AC_DEFINE([readline_echoing_p], [_rl_echoing_p],
|
||||||
|
+ [readline-6.0 started to use different name.])])
|
||||||
|
+ LIBS="$save_LIBS"
|
||||||
|
+ AC_MSG_RESULT([$READLINE_ECHOING_P])
|
||||||
|
else
|
||||||
|
READLINE='$(READLINE_DIR)/libreadline.a'
|
||||||
|
READLINE_DEPS='$(READLINE)'
|
||||||
|
diff -Naur gdb-6.8.91.orig/gdb/lm32-tdep.c gdb-6.8.91-rtems4.10-20090926/gdb/lm32-tdep.c
|
||||||
|
--- gdb-6.8.91.orig/gdb/lm32-tdep.c 2009-07-02 19:25:55.000000000 +0200
|
||||||
|
+++ gdb-6.8.91-rtems4.10-20090926/gdb/lm32-tdep.c 2009-09-26 07:47:29.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.91.orig/gdb/sparc-tdep.c gdb-6.8.91-rtems4.10-20090926/gdb/sparc-tdep.c
|
||||||
|
--- gdb-6.8.91.orig/gdb/sparc-tdep.c 2009-09-07 19:52:41.000000000 +0200
|
||||||
|
+++ gdb-6.8.91-rtems4.10-20090926/gdb/sparc-tdep.c 2009-09-26 07:47:29.000000000 +0200
|
||||||
|
@@ -1100,7 +1100,7 @@
|
||||||
|
sparc32_store_return_value (struct type *type, struct regcache *regcache,
|
||||||
|
const gdb_byte *valbuf)
|
||||||
|
{
|
||||||
|
- int len = TYPE_LENGTH (type);
|
||||||
|
+ size_t len = TYPE_LENGTH (type);
|
||||||
|
gdb_byte buf[8];
|
||||||
|
|
||||||
|
gdb_assert (!sparc_structure_or_union_p (type));
|
||||||
|
diff -Naur gdb-6.8.91.orig/sim/common/Make-common.in gdb-6.8.91-rtems4.10-20090926/sim/common/Make-common.in
|
||||||
|
--- gdb-6.8.91.orig/sim/common/Make-common.in 2009-07-12 18:59:34.000000000 +0200
|
||||||
|
+++ gdb-6.8.91-rtems4.10-20090926/sim/common/Make-common.in 2009-09-26 07:47:29.000000000 +0200
|
||||||
|
@@ -52,6 +52,7 @@
|
||||||
|
tooldir = $(libdir)/$(target_alias)
|
||||||
|
|
||||||
|
datadir = @datadir@
|
||||||
|
+datarootdir = @datarootdir@
|
||||||
|
mandir = @mandir@
|
||||||
|
man1dir = $(mandir)/man1
|
||||||
|
infodir = @infodir@
|
||||||
|
diff -Naur gdb-6.8.91.orig/sim/erc32/configure gdb-6.8.91-rtems4.10-20090926/sim/erc32/configure
|
||||||
|
--- gdb-6.8.91.orig/sim/erc32/configure 2009-08-22 18:56:52.000000000 +0200
|
||||||
|
+++ gdb-6.8.91-rtems4.10-20090926/sim/erc32/configure 2009-09-26 07:47:29.000000000 +0200
|
||||||
|
@@ -591,8 +591,9 @@
|
||||||
|
ac_subst_vars='LTLIBOBJS
|
||||||
|
LIBOBJS
|
||||||
|
cgen_breaks
|
||||||
|
+READLINE_CFLAGS
|
||||||
|
+READLINE_DEPS
|
||||||
|
READLINE
|
||||||
|
-TERMCAP
|
||||||
|
REPORT_BUGS_TEXI
|
||||||
|
REPORT_BUGS_TO
|
||||||
|
PKGVERSION
|
||||||
|
@@ -715,6 +716,7 @@
|
||||||
|
enable_sim_profile
|
||||||
|
with_pkgversion
|
||||||
|
with_bugurl
|
||||||
|
+with_system_readline
|
||||||
|
'
|
||||||
|
ac_precious_vars='build_alias
|
||||||
|
host_alias
|
||||||
|
@@ -1356,6 +1358,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
|
||||||
|
@@ -2411,7 +2414,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.
|
||||||
|
@@ -2911,18 +2913,18 @@
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
-
|
||||||
|
+return 0;
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
ac_clean_files_save=$ac_clean_files
|
||||||
|
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
|
||||||
|
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
|
||||||
|
# Try to create an executable without -o first, disregard a.out.
|
||||||
|
# It will help us diagnose broken compilers, and finding out an intuition
|
||||||
|
# of exeext.
|
||||||
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
|
||||||
|
-$as_echo_n "checking for C compiler default output file name... " >&6; }
|
||||||
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
|
||||||
|
+$as_echo_n "checking whether the C compiler works... " >&6; }
|
||||||
|
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
|
||||||
|
|
||||||
|
# The possible output files:
|
||||||
|
@@ -2984,10 +2986,10 @@
|
||||||
|
else
|
||||||
|
ac_file=''
|
||||||
|
fi
|
||||||
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
|
||||||
|
-$as_echo "$ac_file" >&6; }
|
||||||
|
if test -z "$ac_file"; then :
|
||||||
|
- $as_echo "$as_me: failed program was:" >&5
|
||||||
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||||
|
+$as_echo "no" >&6; }
|
||||||
|
+$as_echo "$as_me: failed program was:" >&5
|
||||||
|
sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
|
||||||
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||||
|
@@ -2995,51 +2997,18 @@
|
||||||
|
{ as_fn_set_status 77
|
||||||
|
as_fn_error "C compiler cannot create executables
|
||||||
|
See \`config.log' for more details." "$LINENO" 5; }; }
|
||||||
|
+else
|
||||||
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||||
|
+$as_echo "yes" >&6; }
|
||||||
|
fi
|
||||||
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
|
||||||
|
+$as_echo_n "checking for C compiler default output file name... " >&6; }
|
||||||
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
|
||||||
|
+$as_echo "$ac_file" >&6; }
|
||||||
|
ac_exeext=$ac_cv_exeext
|
||||||
|
|
||||||
|
-# Check that the compiler produces executables we can run. If not, either
|
||||||
|
-# the compiler is broken, or we cross compile.
|
||||||
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
|
||||||
|
-$as_echo_n "checking whether the C compiler works... " >&6; }
|
||||||
|
-# If not cross compiling, check that we can run a simple program.
|
||||||
|
-if test "$cross_compiling" != yes; then
|
||||||
|
- if { ac_try='./$ac_file'
|
||||||
|
- { { case "(($ac_try" in
|
||||||
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||||
|
- *) ac_try_echo=$ac_try;;
|
||||||
|
-esac
|
||||||
|
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||||||
|
-$as_echo "$ac_try_echo"; } >&5
|
||||||
|
- (eval "$ac_try") 2>&5
|
||||||
|
- ac_status=$?
|
||||||
|
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||||
|
- test $ac_status = 0; }; }; then
|
||||||
|
- cross_compiling=no
|
||||||
|
- else
|
||||||
|
- if test "$cross_compiling" = maybe; then
|
||||||
|
- cross_compiling=yes
|
||||||
|
- else
|
||||||
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||||
|
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||||
|
-as_fn_error "cannot run C compiled programs.
|
||||||
|
-If you meant to cross compile, use \`--host'.
|
||||||
|
-See \`config.log' for more details." "$LINENO" 5; }
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
-fi
|
||||||
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||||
|
-$as_echo "yes" >&6; }
|
||||||
|
-
|
||||||
|
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
|
||||||
|
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
|
||||||
|
ac_clean_files=$ac_clean_files_save
|
||||||
|
-# Check that the compiler produces executables we can run. If not, either
|
||||||
|
-# the compiler is broken, or we cross compile.
|
||||||
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
|
||||||
|
-$as_echo_n "checking whether we are cross compiling... " >&6; }
|
||||||
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
|
||||||
|
-$as_echo "$cross_compiling" >&6; }
|
||||||
|
-
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
|
||||||
|
$as_echo_n "checking for suffix of executables... " >&6; }
|
||||||
|
if { { ac_try="$ac_link"
|
||||||
|
@@ -3079,6 +3048,63 @@
|
||||||
|
rm -f conftest.$ac_ext
|
||||||
|
EXEEXT=$ac_cv_exeext
|
||||||
|
ac_exeext=$EXEEXT
|
||||||
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
+/* end confdefs.h. */
|
||||||
|
+
|
||||||
|
+int
|
||||||
|
+main ()
|
||||||
|
+{
|
||||||
|
+
|
||||||
|
+ ;
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+_ACEOF
|
||||||
|
+ac_clean_files="$ac_clean_files conftest.out"
|
||||||
|
+# Check that the compiler produces executables we can run. If not, either
|
||||||
|
+# the compiler is broken, or we cross compile.
|
||||||
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
|
||||||
|
+$as_echo_n "checking whether we are cross compiling... " >&6; }
|
||||||
|
+if test "$cross_compiling" != yes; then
|
||||||
|
+ { { ac_try="$ac_link"
|
||||||
|
+case "(($ac_try" in
|
||||||
|
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||||
|
+ *) ac_try_echo=$ac_try;;
|
||||||
|
+esac
|
||||||
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||||||
|
+$as_echo "$ac_try_echo"; } >&5
|
||||||
|
+ (eval "$ac_link") 2>&5
|
||||||
|
+ ac_status=$?
|
||||||
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||||
|
+ test $ac_status = 0; }
|
||||||
|
+ if { ac_try='./conftest$ac_cv_exeext'
|
||||||
|
+ { { case "(($ac_try" in
|
||||||
|
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||||
|
+ *) ac_try_echo=$ac_try;;
|
||||||
|
+esac
|
||||||
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||||||
|
+$as_echo "$ac_try_echo"; } >&5
|
||||||
|
+ (eval "$ac_try") 2>&5
|
||||||
|
+ ac_status=$?
|
||||||
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||||
|
+ test $ac_status = 0; }; }; then
|
||||||
|
+ cross_compiling=no
|
||||||
|
+ else
|
||||||
|
+ if test "$cross_compiling" = maybe; then
|
||||||
|
+ cross_compiling=yes
|
||||||
|
+ else
|
||||||
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||||
|
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||||
|
+as_fn_error "cannot run C compiled programs.
|
||||||
|
+If you meant to cross compile, use \`--host'.
|
||||||
|
+See \`config.log' for more details." "$LINENO" 5; }
|
||||||
|
+ fi
|
||||||
|
+ fi
|
||||||
|
+fi
|
||||||
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
|
||||||
|
+$as_echo "$cross_compiling" >&6; }
|
||||||
|
+
|
||||||
|
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
|
||||||
|
+ac_clean_files=$ac_clean_files_save
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
|
||||||
|
$as_echo_n "checking for suffix of object files... " >&6; }
|
||||||
|
if test "${ac_cv_objext+set}" = set; then :
|
||||||
|
@@ -4510,86 +4536,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.
|
||||||
|
@@ -4598,33 +4579,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-6.8.91.orig/sim/erc32/configure.ac gdb-6.8.91-rtems4.10-20090926/sim/erc32/configure.ac
|
||||||
|
--- gdb-6.8.91.orig/sim/erc32/configure.ac 2006-12-20 23:35:51.000000000 +0100
|
||||||
|
+++ gdb-6.8.91-rtems4.10-20090926/sim/erc32/configure.ac 2009-09-26 07:47:29.000000000 +0200
|
||||||
|
@@ -11,27 +11,32 @@
|
||||||
|
|
||||||
|
AC_CHECK_HEADERS(stdlib.h)
|
||||||
|
|
||||||
|
-# In the Cygwin environment, we need some additional flags.
|
||||||
|
-AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin,
|
||||||
|
-[AC_EGREP_CPP(lose, [
|
||||||
|
-#ifdef __CYGWIN__
|
||||||
|
-lose
|
||||||
|
-#endif],[sim_cv_os_cygwin=yes],[sim_cv_os_cygwin=no])])
|
||||||
|
+AC_ARG_WITH([system-readline],
|
||||||
|
+ [AS_HELP_STRING([--with-system-readline],
|
||||||
|
+ [use installed readline library])])
|
||||||
|
|
||||||
|
-if test x$sim_cv_os_cygwin = xyes; then
|
||||||
|
- TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32'
|
||||||
|
+if test "$with_system_readline" = yes; then
|
||||||
|
+ AC_MSG_CHECKING([for readline])
|
||||||
|
+ save_LIBS="$LIBS"
|
||||||
|
+ LIBS="-lreadline $save_LIBS"
|
||||||
|
+ AC_LINK_IFELSE([AC_LANG_CALL([],
|
||||||
|
+ [add_history])], [READLINE=-lreadline],
|
||||||
|
+ [ LIBS="-lreadline -lncurses $save_LIBS"
|
||||||
|
+ AC_LINK_IFELSE([AC_LANG_CALL([],
|
||||||
|
+ [add_history])], [READLINE="-lreadline -lncurses"],
|
||||||
|
+ [AC_MSG_ERROR([unable to detect readline])])
|
||||||
|
+ ])
|
||||||
|
+ LIBS="$save_LIBS"
|
||||||
|
+ AC_MSG_RESULT($READLINE)
|
||||||
|
+ READLINE_DEPS=
|
||||||
|
+ READLINE_CFLAGS=
|
||||||
|
else
|
||||||
|
- AC_CHECK_LIB(termcap, main, TERMCAP=-ltermcap, TERMCAP="")
|
||||||
|
-fi
|
||||||
|
-AC_SUBST(TERMCAP)
|
||||||
|
-
|
||||||
|
-# We prefer the in-tree readline. Top-level dependencies make sure
|
||||||
|
-# src/readline (if it's there) is configured before src/sim.
|
||||||
|
-if test -r ../../readline/Makefile; then
|
||||||
|
- READLINE=../../readline/libreadline.a
|
||||||
|
-else
|
||||||
|
- AC_CHECK_LIB(readline, readline, READLINE=-lreadline,
|
||||||
|
- AC_ERROR([the required "readline" library is missing]), $TERMCAP)
|
||||||
|
+ READLINE='../../readline/libreadline.a -lncurses'
|
||||||
|
+ READLINE_DEPS='$(READLINE)'
|
||||||
|
+ READLINE_CFLAGS='-I$(READLINE_SRC)/..'
|
||||||
|
fi
|
||||||
|
AC_SUBST(READLINE)
|
||||||
|
+AC_SUBST(READLINE_DEPS)
|
||||||
|
+AC_SUBST(READLINE_CFLAGS)
|
||||||
|
+
|
||||||
|
SIM_AC_OUTPUT
|
||||||
|
diff -Naur gdb-6.8.91.orig/sim/erc32/erc32.c gdb-6.8.91-rtems4.10-20090926/sim/erc32/erc32.c
|
||||||
|
--- gdb-6.8.91.orig/sim/erc32/erc32.c 2008-11-11 23:20:54.000000000 +0100
|
||||||
|
+++ gdb-6.8.91-rtems4.10-20090926/sim/erc32/erc32.c 2009-09-26 07:47:29.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.91.orig/sim/erc32/Makefile.in gdb-6.8.91-rtems4.10-20090926/sim/erc32/Makefile.in
|
||||||
|
--- gdb-6.8.91.orig/sim/erc32/Makefile.in 2009-01-14 11:53:07.000000000 +0100
|
||||||
|
+++ gdb-6.8.91-rtems4.10-20090926/sim/erc32/Makefile.in 2009-09-26 07:47:29.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.91.orig/sim/h8300/compile.c gdb-6.8.91-rtems4.10-20090926/sim/h8300/compile.c
|
||||||
|
--- gdb-6.8.91.orig/sim/h8300/compile.c 2008-12-01 17:10:45.000000000 +0100
|
||||||
|
+++ gdb-6.8.91-rtems4.10-20090926/sim/h8300/compile.c 2009-09-26 07:47:29.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.91.orig/sim/m32c/Makefile.in gdb-6.8.91-rtems4.10-20090926/sim/m32c/Makefile.in
|
||||||
|
--- gdb-6.8.91.orig/sim/m32c/Makefile.in 2009-01-14 11:53:07.000000000 +0100
|
||||||
|
+++ gdb-6.8.91-rtems4.10-20090926/sim/m32c/Makefile.in 2009-09-26 07:47:29.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
|
||||||
|
|
||||||
Reference in New Issue
Block a user