2002-11-19 Andrew Cagney <ac131313@redhat.com>

	Problems reported by Paul Eggert.
	* gdbarch.sh: Use `sort -k 3`.  Fix PR gdb/527.

Index: doc/ChangeLog
2002-11-19  Andrew Cagney  <ac131313@redhat.com>

	Fix POSIX problem reported by Paul Eggert.
	* Makefile.in (GDBvn.texi): Use `sed q' instead of `head -1'.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0029b7a..7589bd3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-19  Andrew Cagney  <ac131313@redhat.com>
+
+       Problems reported by Paul Eggert.
+       * gdbarch.sh: Use `sort -k 3`.  Fix PR gdb/527.
+
 2002-11-19  Andreas Schwab  <schwab@suse.de>
 
        * m68klinux-nat.c (IS_SIGTRAMP, IS_RT_SIGTRAMP) 
@@ -47,6 +52,7 @@
        * gdb/parser-defs.h: (struct objc_class_str): New structure
        for parsing ObjC classes.
 
+>>>>>>> 1.3477
 2002-11-18  Andrew Cagney  <ac131313@redhat.com>
 
        * stack.c (frame_relative_level): Copy function from here ...

diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 7f05283..564245e 100644 (file)
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-19  Andrew Cagney  <ac131313@redhat.com>
+
+       Fix POSIX problem reported by Paul Eggert.
+       * Makefile.in (GDBvn.texi): Use `sed q' instead of `head -1'.
+       Fix PR gdb/527.
+
 2002-10-26  Andrew Cagney  <cagney@redhat.com>
 
        * gdbint.texinfo (Target Architecture Definition): Delete

diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
index ba0031a..80f39b3 100644 (file)
--- a/gdb/doc/Makefile.in
+++ b/gdb/doc/Makefile.in
@@ -218,7 +218,7 @@ refcard.ps : refcard.dvi
 
 # File to record current GDB version number (copied from main dir version.in)
 GDBvn.texi : ${gdbdir}/version.in
-       echo "@set GDBVN `head -1 $(srcdir)/../version.in`" > ./GDBvn.new
+       echo "@set GDBVN `sed q $(srcdir)/../version.in`" > ./GDBvn.new
        mv GDBvn.new GDBvn.texi
 
 # Updated atomically

diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index f7f9a66..9bbce75 100755 (executable)
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -1562,7 +1562,7 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
                       "gdbarch_dump: GDB_MULTI_ARCH = %d\\n",
                       GDB_MULTI_ARCH);
 EOF
-function_list | sort -t: +2 | while do_read
+function_list | sort -t: -k 3 | while do_read
 do
     # multiarch functions don't have macros.
     if class_is_multiarch_p