am33 sanitize changes

7 files changed, 43 insertions, 59 deletions

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 0dbfff1..b2dad61 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -767,33 +767,6 @@ else
 	done
 fi
 
-if ( echo $* | grep keep\-am33 > /dev/null ) ; then
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-am33 $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping am33 stuff in $i
-			fi
-		fi
-	done
-else
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-am33 $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"am33\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-am33/,/end-\sanitize\-am33/d' < $i > new
-			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
-				if [ -n "${verbose}" ] ; then
-					echo Caching $i in .Recover...
-				fi
-				mv $i .Recover
-			fi
-			mv new $i
-		fi
-	done
-fi
-
 if ( echo $* | grep keep\-vr4111 > /dev/null ) ; then
 	for i in * ; do
 		if test ! -d $i && (grep sanitize-vr4111 $i > /dev/null) ; then
diff --git a/gdb/ChangeLog-98 b/gdb/ChangeLog-98
index 68ba2be..96d8543 100644
--- a/gdb/ChangeLog-98
+++ b/gdb/ChangeLog-98
@@ -5055,7 +5055,7 @@ Thu Jul 30 13:53:50 1998  Mark Alexander  <marka@cygnus.com>
 	* symfile.c (add_symbol_file_command): Test for the from_tty
 	parameter and avoid query when not interactive.
 
-start-sanitize-am33
+start-sanitize-cygnus
 Wed Jul 29 10:39:29 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* mn10300-tdep.c (set_movm_offsets): Do nothing for the am33
@@ -5063,7 +5063,7 @@ Wed Jul 29 10:39:29 1998  Jeffrey A Law  (law@cygnus.com)
 	(mn10300_frame_chain, mn10300_frame_saved_pc): Similarly.
 	(set_machine_hook): Keep track of whether or not we're in am33 mode.
 
-end-sanitize-am33
+end-sanitize-cygnus
 Mon Jul 27 16:11:42 1998  Michael Snyder  <msnyder@cleaver.cygnus.com>
 
 	* tracepoint.c (remote_set_transparent_ranges): new function.
@@ -5090,14 +5090,14 @@ Mon Jul 27 10:45:56 1998  Martin M. Hunt  <hunt@cygnus.com>
 	stack pointer et al are synthesized from the SP_REGNUM (etc)
 	defines and should not be mentioned in REGISTER_NAMES.
 
-start-sanitize-am33
+start-sanitize-cygnus
 Mon Jul 27 08:54:41 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* mn10300-tdep.c (mn10300_frame_chain): Account for space saved
 	by am33 register saves.
 	(mn10300_frame_saved_pc): Similarly.
 
-end-sanitize-am33
+end-sanitize-cygnus
 Fri Jul 24 14:41:19 1998  Michael Snyder  <msnyder@cleaver.cygnus.com>
 
 	* tracepoint.c (encode_actions): Treat register names and simple
@@ -5211,11 +5211,11 @@ Thu Jul  9 16:16:47 1998  Jeffrey A Law  (law@cygnus.com)
 	* tm-mn10300 (NUM_REGS): Bump to 32.
 	(REGISTER_NAMES): Updated accordingly.
 
-start-sanitize-am33
+start-sanitize-cygnus
 	* mn10300-tdep.c (am33_register_names): New variable.
 	(mn10300_analyze_prologue): Handle regs saved by am33 prologues.
 	* tm-mn10300.h (E0_REGNUM): Define.
-end-sanitize-am33
+end-sanitize-cygnus
 
 Tue Jul 7 7:40:13 1998  Ron Unrau  <runrau@cygnus.com>
 
diff --git a/gdb/config/mn10300/.Sanitize b/gdb/config/mn10300/.Sanitize
index 7249e27..db18eb4 100644
--- a/gdb/config/mn10300/.Sanitize
+++ b/gdb/config/mn10300/.Sanitize
@@ -30,22 +30,22 @@ Things-to-lose:
 
 Do-last:
 
-if ( echo $* | grep keep\-am33 > /dev/null ) ; then
+if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-am33 $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping am33 stuff in $i
+				echo Keeping cygnus stuff in $i
 			fi
 		fi
 	done
 else
 	for i in * ; do
-		if test ! -d $i && (grep sanitize-am33 $i > /dev/null) ; then
+		if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"am33\" from $i...
+				echo Removing traces of \"cygnus\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-am33/,/end-\sanitize\-am33/d' < $i > new
+			sed '/start\-sanitize\-cygnus/,/end-\sanitize\-cygnus/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
diff --git a/gdb/config/mn10300/tm-mn10300.h b/gdb/config/mn10300/tm-mn10300.h
index b772323..a7904e1 100644
--- a/gdb/config/mn10300/tm-mn10300.h
+++ b/gdb/config/mn10300/tm-mn10300.h
@@ -50,9 +50,9 @@ extern char **mn10300_register_names;
 #define PSW_REGNUM 11
 #define LIR_REGNUM 12
 #define LAR_REGNUM 13
-/* start-sanitize-am33 */
+/* start-sanitize-cygnus */
 #define E0_REGNUM 14
-/* end-sanitize-am33 */
+/* end-sanitize-cygnus */
 
 /* Pseudo register that contains true address of executing stack frame */
 #define FP_REGNUM 31
diff --git a/gdb/testsuite/.Sanitize b/gdb/testsuite/.Sanitize
index 3ac79a3..1b790ce 100644
--- a/gdb/testsuite/.Sanitize
+++ b/gdb/testsuite/.Sanitize
@@ -83,23 +83,23 @@ for i in $never_files ; do
         fi
 done
 
-am33_files="ChangeLog"
-if ( echo $* | grep keep\-am33 > /dev/null ) ; then
-	for i in $am33_files ; do
-		if test ! -d $i && (grep sanitize-am33 $i > /dev/null) ; then
+cygnus_files="ChangeLog"
+if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
+	for i in $cygnus_files ; do
+		if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping am33 stuff in $i
+				echo Keeping cygnus stuff in $i
 			fi
 		fi
 	done
 else
-	for i in $am33_files ; do
-		if test ! -d $i && (grep sanitize-am33 $i > /dev/null) ; then
+	for i in $cygnus_files ; do
+		if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"am33\" from $i...
+				echo Removing traces of \"cygnus\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-am33/,/end-\sanitize\-am33/d' < $i > new
+			sed '/start\-sanitize\-cygnus/,/end-\sanitize\-cygnus/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ba476d2..be9f840 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+Thu Jan 21 15:46:49 1999  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* gdb.base/Makefile.in, gdb.c++/Makefile.in,
+ 	gdb.trace/Makefile.in (clean): Remove all test executables.
+
+Tue Jan 19 17:20:09 1999  David Taylor  <taylor@texas.cygnus.com>
+
+	* gdb.base/shlib-call.exp: add test cases to verify that gdb
+	successfully re-sets breakpoints in shared libraries.
+	* gdb.base/shmain.c (main): return 0, don't fall off the end.
+
 Fri Jan 15 14:04:57 1999  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
 
 	* gdb.hp/xdb3.exp: do not execute unless on hppa-hpux platform 
@@ -430,7 +441,7 @@ Fri Jul 24 14:57:19 1998  Keith Seitz  <keiths@cygnus.com>
 	* gdb.gdbtk/stack1.c,stack2.c: Test case for browser window.
 	
 end-sanitize-gdbtk
-start-sanitize-am33
+start-sanitize-cygnus
 Fri Jul 24 15:51:34 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* gdb.disasm/am33.s: Add tests for autoincrement instructions.
@@ -442,7 +453,7 @@ Thu Jul 16 18:20:46 1998  Jeffrey A Law  (law@cygnus.com)
 	* gdb.disasm/am33.s: Add 4 operand mul and mulu tests.
 	* gdb.disasm/am33.exp: Corresponding changes.
 
-end-sanitize-am33
+end-sanitize-cygnus
 start-sanitize-cygnus-never
 Tue Jul 14 16:11:11 1998  Keith Seitz  <keiths@cygnus.com>
 
@@ -485,26 +496,26 @@ Fri Jun 26 14:52:47 1998  Peter Schauer  <pes@regent.e-technik.tu-muenchen.de>
 	* gdb.base/scope.exp:  Remove extraneous newline in filelocal_bss
 	before run test.
 
-start-sanitize-am33
+start-sanitize-cygnus
 Fri Jun 26 11:12:17 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* am33.exp: Just compile, do not link the testcase.
 	* am33.s: Add ".am33" pseudoop to force am33 mode.
 
-end-sanitize-am33
+end-sanitize-cygnus
 1998-06-25  Felix Lee  <flee@cygnus.com>
 
 	* gdb.base/setshow.exp: make sure $pc is sane.
 
 	* gdb.stabs/weird.exp: split expect patterns properly.
 
-start-sanitize-am33
+start-sanitize-cygnus
 Wed Jun 24 13:03:15 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* gdb.disasm/am33.s: New disassembler testfile for the am33.
 	* gdb.disasm/am33.exp: Run it.
 
-end-sanitize-am33
+end-sanitize-cygnus
 Tue Jun 23 11:45:01 1998  Michael Snyder  <msnyder@cleaver.cygnus.com>
 
 	* gdb.base/funcargs.exp: simplify expect strings to ease pattern
diff --git a/gdb/testsuite/gdb.disasm/.Sanitize b/gdb/testsuite/gdb.disasm/.Sanitize
index 7320faf..bf00488 100644
--- a/gdb/testsuite/gdb.disasm/.Sanitize
+++ b/gdb/testsuite/gdb.disasm/.Sanitize
@@ -15,12 +15,12 @@
 
 Do-first:
 
-am33_files="am33.s am33.exp"
+cygnus_files="am33.s am33.exp"
 
 if ( echo $* | grep keep\-am33 > /dev/null ) ; then
-        keep_these_too="${am33_files} ${keep_these_too}"
+        keep_these_too="${cygnus_files} ${keep_these_too}"
 else
-        lose_these_too="${am33_files} ${lose_these_too}"
+        lose_these_too="${cygnus_files} ${lose_these_too}"
 fi
 
 # All files listed between the "Things-to-keep:" line and the