diff options
| -rw-r--r-- | gas/.Sanitize | 28 | ||||
| -rw-r--r-- | gas/ChangeLog | 28 | ||||
| -rw-r--r-- | gas/config/.Sanitize | 30 | ||||
| -rw-r--r-- | gas/config/tc-mn10300.c | 60 | ||||
| -rw-r--r-- | gas/testsuite/.Sanitize | 28 | ||||
| -rw-r--r-- | gas/testsuite/ChangeLog | 31 | ||||
| -rw-r--r-- | gas/testsuite/gas/mn10300/.Sanitize | 26 | ||||
| -rwxr-xr-x | gas/testsuite/gas/mn10300/basic.exp | 8 |
8 files changed, 81 insertions, 158 deletions
diff --git a/gas/.Sanitize b/gas/.Sanitize index f14d590..f89b5fa 100644 --- a/gas/.Sanitize +++ b/gas/.Sanitize @@ -333,34 +333,6 @@ else done fi -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 - if [ -n "${verbose}" ] ; then - echo Keeping am33 stuff in $i - fi - fi - done -else - for i in $am33_files ; 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 - m32rx_files="ChangeLog ChangeLog-9697 configure.in configure" if ( echo $* | grep keep\-m32rx > /dev/null ) ; then for i in $m32rx_files ; do diff --git a/gas/ChangeLog b/gas/ChangeLog index 88a1eb9..5fa058c 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -947,13 +947,13 @@ Tue Jul 21 16:50:52 1998 Doug Evans <devans@seba.cygnus.com> * cgen.c (cgen_md_apply_fix3): set_operand renamed to set_vma_operand. Update call to insert_operand. -start-sanitize-am33 +start-sanitize-cygnus Tue Jul 21 10:58:47 1998 Jeffrey A Law (law@cygnus.com) * config/tc-mn10300.c (md_assemble): Handle autoincrement addressing modes. -end-sanitize-am33 +end-sanitize-cygnus Fri Jul 17 11:42:20 1998 Nick Clifton <nickc@cygnus.com> * config/tc-m32r.c (ms_show_usage): Formatting changes. @@ -1135,13 +1135,13 @@ Wed Jul 1 21:38:56 1998 J"orn Rennecke <amylaar@cygnus.co.uk> * config/tc-sh (COND_JUMP_DELAY, COND12_DELAY_LENGTH): Define. Changed all users of COND12_DELAY. -start-sanitize-am33 +start-sanitize-cygnus Mon Jun 29 14:58:36 1998 Jeffrey A Law (law@cygnus.com) * config/tc-mn10300.c (r_registers): Fix typo and add some missing registers. -end-sanitize-am33 +end-sanitize-cygnus start-sanitize-branchbug4011 Mon Jun 29 09:36:27 1998 Gavin Koch <gavin@cygnus.com> @@ -1178,7 +1178,7 @@ Wed Jun 24 11:50:54 1998 Klaus Kaempf <kkaempf@progis.de> * config/obj-vms.c (Create_VMS_Object_File): Force binary file. -start-sanitize-am33 +start-sanitize-cygnus Wed Jun 24 09:38:10 1998 Jeffrey A Law (law@cygnus.com) * config/tc-mn10300.c (r_registers): Add a0-a3,d0-d3 and e0-e7 @@ -1187,7 +1187,7 @@ Wed Jun 24 09:38:10 1998 Jeffrey A Law (law@cygnus.com) for "xrN" registers. (md_assemble): Fix typo computing the size of relocations. -end-sanitize-am33 +end-sanitize-cygnus Tue Jun 23 17:47:31 1998 Jim Wilson <wilson@cygnus.com> * config/tc-h8300.c (do_a_fix_imm, build_bytes): Replace cast to @@ -1215,12 +1215,12 @@ Mon Jun 22 19:52:42 1998 Ian Lance Taylor <ian@cygnus.com> * config/obj-coff.c (c_symbol_merge): Fix copying of auxiliary information. -start-sanitize-am33 +start-sanitize-cygnus Mon Jun 22 13:45:19 1998 Jeffrey A Law (law@cygnus.com) * config/tc-mn10300: Handle FMT_D10 instructions. -end-sanitize-am33 +end-sanitize-cygnus Mon Jun 22 15:18:58 1998 Ian Lance Taylor <ian@cygnus.com> * config/tc-i386.c (i386_operand): Be prepared for a space between @@ -1252,7 +1252,7 @@ Fri Jun 19 19:56:50 1998 Jeffrey A Law (law@cygnus.com) mips_cpu == 5900. end-sanitize-r5900 -start-sanitize-am33 +start-sanitize-cygnus Fri Jun 19 16:49:56 1998 Jeffrey A Law (law@cygnus.com) * config/tc-mn10300.c (md_assemble): Handle FMT_D8 and FMT_D9 @@ -1260,7 +1260,7 @@ Fri Jun 19 16:49:56 1998 Jeffrey A Law (law@cygnus.com) (mn10300_insert_operand): Likewise. (mn10300_check_operand): Likewise. -end-sanitize-am33 +end-sanitize-cygnus Fri Jun 19 13:57:06 1998 Ian Lance Taylor <ian@cygnus.com> * write.c (adjust_reloc_syms): Never adjust relocs against weak @@ -1269,13 +1269,13 @@ Fri Jun 19 13:57:06 1998 Ian Lance Taylor <ian@cygnus.com> Fri Jun 19 09:50:17 1998 Jeffrey A Law (law@cygnus.com) -start-sanitize-am33 +start-sanitize-cygnus * config/tc-mn10300.c (r_registers): Add missing registers. (xr_registers): New set of registers. (xr_register_name): New function. (md_assemble): Handle XRREG and PLUS operands. Tweak handling of RREG operand insertion. Handle new D6 and D7 instruction formats. -end-sanitize-am33 +end-sanitize-cygnus * config/tc-mn10300.c (mn10300_insert_operand): Do not hardcode the shift amount for a repeated operand. The shift amount for the repeated copy comes from the size of the operand. @@ -1291,14 +1291,14 @@ Fri Jun 19 00:04:26 1998 Doug Evans <devans@seba.cygnus.com> BFD_RELOC_MIPS_DVP_11_S4, BFD_RELOC_MIPS_DVP_U15_S3. end-sanitize-sky -start-sanitize-am33 +start-sanitize-cygnus Wed Jun 17 18:09:03 1998 Jeffrey A Law (law@cygnus.com) * config/tc-mn10300.c (r_registers): New register table. (r_register_name): New function. (md_assemble): Handle new am33 operand types. -end-sanitize-am33 +end-sanitize-cygnus Wed Jun 17 13:07:05 1998 Ian Lance Taylor <ian@cygnus.com> * config/tc-mips.c (md_show_usage): Fix -mipsN usage. diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize index 2be1a48..c70d252 100644 --- a/gas/config/.Sanitize +++ b/gas/config/.Sanitize @@ -182,34 +182,6 @@ Things-to-lose: Do-last: -am33_files="tc-mn10300.c" -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 - if [ -n "${verbose}" ] ; then - echo Keeping am33 stuff in $i - fi - fi - done -else - for i in $am33_files ; 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 - r5900_files="tc-mips.c" if ( echo $* | grep keep\-r5900 > /dev/null ) ; then for i in $r5900_files ; do @@ -238,7 +210,7 @@ else done fi -cygnus_files="tc-mips.c tc-hppa.c" +cygnus_files="tc-mips.c tc-hppa.c tc-mn10300.c" 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 diff --git a/gas/config/tc-mn10300.c b/gas/config/tc-mn10300.c index 1389a9b..75b923b 100644 --- a/gas/config/tc-mn10300.c +++ b/gas/config/tc-mn10300.c @@ -120,9 +120,9 @@ size_t md_longopts_size = sizeof(md_longopts); const pseudo_typeS md_pseudo_table[] = { { "am30", set_arch_mach, 300 }, - /* start-sanitize-am33 */ + /* start-sanitize-cygnus */ { "am33", set_arch_mach, 330 }, - /* end-sanitize-am33 */ + /* end-sanitize-cygnus */ { "mn10300", set_arch_mach, 300 }, {NULL, 0, 0} }; @@ -149,7 +149,7 @@ static const struct reg_name address_registers[] = }; #define ADDRESS_REG_NAME_CNT (sizeof(address_registers) / sizeof(struct reg_name)) -/* start-sanitize-am33 */ +/* start-sanitize-cygnus */ static const struct reg_name r_registers[] = { { "a0", 8 }, @@ -221,7 +221,7 @@ static const struct reg_name xr_registers[] = }; #define XR_REG_NAME_CNT (sizeof(xr_registers) / sizeof(struct reg_name)) -/* end-sanitize-am33 */ +/* end-sanitize-cygnus */ static const struct reg_name other_registers[] = { @@ -263,7 +263,7 @@ reg_name_search (regs, regcount, name) } -/* start-sanitize-am33 */ +/* start-sanitize-cygnus */ /* Summary of register_name(). * * in: Input_line_pointer points to 1st char of operand. @@ -355,7 +355,7 @@ xr_register_name (expressionP) return false; } } -/* end-sanitize-am33 */ +/* end-sanitize-cygnus */ /* Summary of register_name(). * @@ -1024,7 +1024,7 @@ md_assemble (str) *input_line_pointer = c; goto keep_going; } - /* start-sanitize-am33 */ + /* start-sanitize-cygnus */ else if (operand->flags & MN10300_OPERAND_RREG) { if (!r_register_name (&ex)) @@ -1129,7 +1129,7 @@ md_assemble (str) input_line_pointer++; goto keep_going; } - /* end-sanitize-am33 */ + /* end-sanitize-cygnus */ else if (operand->flags & MN10300_OPERAND_PSW) { char *start = input_line_pointer; @@ -1216,7 +1216,7 @@ md_assemble (str) value |= 0x08; *input_line_pointer = c; } - /* start-sanitize-am33 */ + /* start-sanitize-cygnus */ else if (strcasecmp (start, "exreg0") == 0) { value |= 0x04; @@ -1237,7 +1237,7 @@ md_assemble (str) value |= 0xff; *input_line_pointer = c; } - /* end-sanitize-am33 */ + /* end-sanitize-cygnus */ else { input_line_pointer = hold; @@ -1269,7 +1269,7 @@ md_assemble (str) str = hold; goto error; } - /* start-sanitize-am33 */ + /* start-sanitize-cygnus */ else if (r_register_name (&ex)) { input_line_pointer = hold; @@ -1282,7 +1282,7 @@ md_assemble (str) str = hold; goto error; } - /* end-sanitize-am33 */ + /* end-sanitize-cygnus */ else if (*str == ')' || *str == '(') { input_line_pointer = hold; @@ -1307,9 +1307,9 @@ md_assemble (str) int mask; mask = MN10300_OPERAND_DREG | MN10300_OPERAND_AREG; - /* start-sanitize-am33 */ + /* start-sanitize-cygnus */ mask |= MN10300_OPERAND_RREG | MN10300_OPERAND_XRREG; - /* end-sanitize-am33 */ + /* end-sanitize-cygnus */ if ((operand->flags & mask) == 0) { input_line_pointer = hold; @@ -1326,12 +1326,12 @@ md_assemble (str) || opcode->format == FMT_S6 || opcode->format == FMT_D5) extra_shift = 16; - /* start-sanitize-am33 */ + /* start-sanitize-cygnus */ else if (opcode->format == FMT_D7) extra_shift = 8; else if (opcode->format == FMT_D8 || opcode->format == FMT_D9) extra_shift = 8; - /* end-sanitize-am33 */ + /* end-sanitize-cygnus */ else extra_shift = 0; @@ -1459,7 +1459,7 @@ keep_going: if (opcode->format == FMT_S2 || opcode->format == FMT_D1) size = 3; - /* start-sanitize-am33 */ + /* start-sanitize-cygnus */ if (opcode->format == FMT_D6) size = 3; @@ -1471,7 +1471,7 @@ keep_going: if (opcode->format == FMT_D9) size = 7; - /* end-sanitize-am33 */ + /* end-sanitize-cygnus */ if (opcode->format == FMT_S4) size = 5; @@ -1556,11 +1556,11 @@ keep_going: if (opcode->format == FMT_S0 || opcode->format == FMT_S1 || opcode->format == FMT_D0 - /* start-sanitize-am33 */ + /* start-sanitize-cygnus */ || opcode->format == FMT_D6 || opcode->format == FMT_D7 || opcode->format == FMT_D10 - /* end-sanitize-am33 */ + /* end-sanitize-cygnus */ || opcode->format == FMT_D1) { number_to_chars_bigendian (f, insn, size); @@ -1635,7 +1635,7 @@ keep_going: number_to_chars_littleendian (f + 2, temp, 4); number_to_chars_bigendian (f + 6, extension & 0xff, 1); } - /* start-sanitize-am33 */ + /* start-sanitize-cygnus */ else if (opcode->format == FMT_D8) { unsigned long temp = ((insn & 0xff) << 16) | (extension & 0xffff); @@ -1649,7 +1649,7 @@ keep_going: number_to_chars_bigendian (f, (insn >> 8) & 0xffffff, 3); number_to_chars_littleendian (f + 3, temp, 4); } - /* end-sanitize-am33 */ + /* end-sanitize-cygnus */ /* Create any fixups. */ for (i = 0; i < fc; i++) @@ -1690,10 +1690,10 @@ keep_going: implicitly 32bits. */ if ((operand->flags & MN10300_OPERAND_SPLIT) != 0) reloc_size = 32; - /* start-sanitize-am33 */ + /* start-sanitize-cygnus */ else if ((operand->flags & MN10300_OPERAND_24BIT) != 0) reloc_size = 24; - /* end-sanitize-am33 */ + /* end-sanitize-cygnus */ else reloc_size = operand->bits; @@ -1901,10 +1901,10 @@ mn10300_insert_operand (insnp, extensionp, operand, val, file, line, shift) int bits; bits = operand->bits; - /* start-sanitize-am33 */ + /* start-sanitize-cygnus */ if (operand->flags & MN10300_OPERAND_24BIT) bits = 24; - /* end-sanitize-am33 */ + /* end-sanitize-cygnus */ if ((operand->flags & MN10300_OPERAND_SIGNED) != 0) { @@ -1940,14 +1940,14 @@ mn10300_insert_operand (insnp, extensionp, operand, val, file, line, shift) *extensionp |= ((val & ((1 << (32 - operand->bits)) - 1)) << operand->shift); } - /* start-sanitize-am33 */ + /* start-sanitize-cygnus */ else if ((operand->flags & MN10300_OPERAND_24BIT) != 0) { *insnp |= (val >> (24 - operand->bits)) & ((1 << operand->bits) - 1); *extensionp |= ((val & ((1 << (24 - operand->bits)) - 1)) << operand->shift); } - /* end-sanitize-am33 */ + /* end-sanitize-cygnus */ else if ((operand->flags & MN10300_OPERAND_EXTENDED) == 0) { *insnp |= (((long) val & ((1 << operand->bits) - 1)) @@ -1984,10 +1984,10 @@ check_operand (insn, operand, val) int bits; bits = operand->bits; - /* start-sanitize-am33 */ + /* start-sanitize-cygnus */ if (operand->flags & MN10300_OPERAND_24BIT) bits = 24; - /* end-sanitize-am33 */ + /* end-sanitize-cygnus */ if ((operand->flags & MN10300_OPERAND_SIGNED) != 0) { diff --git a/gas/testsuite/.Sanitize b/gas/testsuite/.Sanitize index bf61436..49b4030 100644 --- a/gas/testsuite/.Sanitize +++ b/gas/testsuite/.Sanitize @@ -72,34 +72,6 @@ else done fi -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 - if [ -n "${verbose}" ] ; then - echo Keeping am33 stuff in $i - fi - fi - done -else - for i in $am33_files ; 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 - cygnus_files="ChangeLog" if ( echo $* | grep keep\-cygnus > /dev/null ) ; then for i in $cygnus_files ; do diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 9f965bf..a254b0c 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,10 @@ +start-sanitize-m32rx +1999-01-06 Doug Evans <devans@casey.cygnus.com> + + * gas/m32r/interfere.s: New testcase. + * gas/m32r/error.exp: Run it. + +end-sanitize-m32rx start-sanitize-r5900 1999-01-06 Frank Ch. Eigler <fche@cygnus.com> @@ -159,7 +166,7 @@ Tue Jul 28 10:11:22 1998 Doug Evans <devans@canuck.cygnus.com> * gas/m32r/m32rx.d: Ditto. end-sanitize-m32rx -start-sanitize-am33 +start-sanitize-cygnus Thu Jul 23 09:22:09 1998 Jeffrey A Law (law@cygnus.com) * gas/mn10300/am33_8.s: Test DSP autoincrement memory loads/stores. @@ -168,19 +175,19 @@ Thu Jul 23 09:22:09 1998 Jeffrey A Law (law@cygnus.com) * gas/mn10300/am_*.s: Test autoincrement memory loads/stores. * gas/mn10300/basic.exp: Corresponding changes. -end-sanitize-am33 +end-sanitize-cygnus Tue Jul 21 12:46:59 1998 Alan Modra <alan@spri.levels.unisa.edu.au> * gas/i386/white.s: Add some more whitespace tests. * gas/i386/white.l: Update accordingly. -start-sanitize-am33 +start-sanitize-cygnus Thu Jul 16 18:16:49 1998 Jeffrey A Law (law@cygnus.com) * gas/mn10300/am33_5.s: Test 4 operand mul, mulu. * gas/mn10300/basic.exp: Corresponding changes. -end-sanitize-am33 +end-sanitize-cygnus Mon Jul 13 18:15:11 1998 Alan Modra <alan@spri.levels.unisa.edu.au> * gas/i386/*: All new i386 testsuite. @@ -200,7 +207,7 @@ Wed Jul 1 17:31:39 1998 Ian Lance Taylor <ian@cygnus.com> * gas/ppc/simpshft.d: Change accordingly. Only dump the .text section. -start-sanitize-am33 +start-sanitize-cygnus Fri Jun 26 11:17:46 1998 Jeffrey A Law (law@cygnus.com) * gas/mn10300/am33.s: Add .am33 pseudo-op to force am33 mode. @@ -212,7 +219,7 @@ Wed Jun 24 10:10:52 1998 Jeffrey A Law (law@cygnus.com) * gas/mn10300/basic.exp (do_am33_3): Fix typo. -end-sanitize-am33 +end-sanitize-cygnus Tue Jun 23 15:14:43 1998 Nick Clifton <nickc@cygnus.com> * gas/v850/hilo2.s: Use r1 as the destination of the movea @@ -221,7 +228,7 @@ Tue Jun 23 15:14:43 1998 Nick Clifton <nickc@cygnus.com> * gas/v850/basic.exp: Fix names of special area relocations. Set -mwarn-signed-overflow flag when running range.s test. -start-sanitize-am33 +start-sanitize-cygnus Mon Jun 22 13:43:43 1998 Jeffrey A Law (law@cygnus.com) * gas/mn10300/am33_6.s: New test. @@ -229,7 +236,7 @@ Mon Jun 22 13:43:43 1998 Jeffrey A Law (law@cygnus.com) * gas/mn10300/am33_8.s: Likewise. * gas/mn10300/basic.exp: Run them. -end-sanitize-am33 +end-sanitize-cygnus start-sanitize-r5900 Mon Jun 22 11:08:07 1998 Frank Ch. Eigler <fche@cygnus.com> @@ -241,7 +248,7 @@ Sun Jun 21 12:44:43 1998 Nick Clifton <nickc@cygnus.com> * gas/d30v/reloc.d: Updated to match latest assembler output. -start-sanitize-am33 +start-sanitize-cygnus Fri Jun 19 16:48:14 1998 Jeffrey A Law (law@cygnus.com) * gas/mn10300/am33_4.s: New test. @@ -254,7 +261,7 @@ Fri Jun 19 09:45:17 1998 Jeffrey A Law (law@cygnus.com) * gas/mn10300/am33_3.s: New test. * gas/mn10300/basic.exp: Run them. -end-sanitize-am33 +end-sanitize-cygnus start-sanitize-sky Thu Jun 18 23:56:24 1998 Doug Evans <devans@seba.cygnus.com> @@ -262,13 +269,13 @@ Thu Jun 18 23:56:24 1998 Doug Evans <devans@seba.cygnus.com> * gas/dvp/dvp.exp: Run it. end-sanitize-sky -start-sanitize-am33 +start-sanitize-cygnus Wed Jun 17 18:14:33 1998 Jeffrey A Law (law@cygnus.com) * gas/mn10300/am33.s: New test. * gas/mn10300/basic.exp: Run it. -end-sanitize-am33 +end-sanitize-cygnus Wed Jun 17 14:02:10 1998 Frank Ch. Eigler <fche@cygnus.com> * gas/mips/delay.d: Add -mcpu=NNNN to gas flags to let test case diff --git a/gas/testsuite/gas/mn10300/.Sanitize b/gas/testsuite/gas/mn10300/.Sanitize index e48e2df..3c479d3 100644 --- a/gas/testsuite/gas/mn10300/.Sanitize +++ b/gas/testsuite/gas/mn10300/.Sanitize @@ -17,12 +17,12 @@ Do-first: -am33_files="am33.s am33_2.s am33_3.s am33_4.s am33_5.s am33_6.s am33_7.s am33_8.s" +cygnus_files="am33.s am33_2.s am33_3.s am33_4.s am33_5.s am33_6.s am33_7.s am33_8.s" -if ( echo $* | grep keep\-am33 > /dev/null ) ; then - keep_these_too="${am33_files} ${keep_these_too}" +if ( echo $* | grep keep\-cygnus > /dev/null ) ; then + 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 @@ -58,23 +58,23 @@ Things-to-lose: Do-last: -am33_files="basic.exp" -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="basic.exp" +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/gas/testsuite/gas/mn10300/basic.exp b/gas/testsuite/gas/mn10300/basic.exp index 5b74154..a306583 100755 --- a/gas/testsuite/gas/mn10300/basic.exp +++ b/gas/testsuite/gas/mn10300/basic.exp @@ -960,7 +960,7 @@ proc do_udf {} { if [expr $x==160] then { pass $testname } else { fail $testname } } -# start-sanitize-am33 +# start-sanitize-cygnus proc do_am33_1 {} { set testname "am33.s: am33 tests part 1" set x 0 @@ -1711,7 +1711,7 @@ proc do_am33_8 {} { if [expr $x==67] then { pass $testname } else { fail $testname } } -# end-sanitize-am33 +# end-sanitize-cygnus if [istarget mn10300*-*-*] then { # Test the basic instruction parser. @@ -1735,7 +1735,7 @@ if [istarget mn10300*-*-*] then { do_shift do_sub do_udf -# start-sanitize-am33 +# start-sanitize-cygnus do_am33_1 do_am33_2 do_am33_3 @@ -1744,5 +1744,5 @@ if [istarget mn10300*-*-*] then { do_am33_6 do_am33_7 do_am33_8 -# end-sanitize-am33 +# end-sanitize-cygnus } |