Remove ARC sanitization.

4 files changed, 38 insertions, 175 deletions

diff --git a/opcodes/.Sanitize b/opcodes/.Sanitize
index dc6820a..e3a074f 100644
--- a/opcodes/.Sanitize
+++ b/opcodes/.Sanitize
@@ -15,14 +15,6 @@
 
 Do-first:
 
-arc_files="arc-dis.c arc-opc.c"
-
-if ( echo $* | grep keep\-arc > /dev/null ) ; then
-	keep_these_too="${arc_files} ${keep_these_too}"
-else
-	lose_these_too="${arc_files} ${lose_these_too}"
-fi
-
 d30v_files="d30v-dis.c d30v-opc.c"
 
 if ( echo $* | grep keep\-d30v > /dev/null ) ; then
@@ -72,6 +64,8 @@ acinclude.m4
 aclocal.m4
 alpha-dis.c
 alpha-opc.c
+arc-dis.c
+arc-opc.c
 arm-dis.c
 arm-opc.h
 a29k-dis.c
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 7f91875..a7700ec 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,13 @@
+Fri Aug 15 05:17:48 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* configure.in (bfd_arc_arch): Add.
+	* configure: Rebuild.
+	* Makefile.am (ALL_MACHINES): Add arc-dis.lo, arc-opc.lo.
+	* Makefile.in: Rebuild.
+	* arc-dis.c, arc-opc.c: New files.
+	* disassemble.c (ARCH_all): Define ARCH_arc.
+	(disassembler): Add ARC support.
+
 start-sanitize-v850
 Wed Aug 13 18:52:11 1997  Nick Clifton  <nickc@cygnus.com>
 
@@ -2342,12 +2352,6 @@ Tue Jul 11 11:49:49 1995  Ian Lance Taylor  <ian@cygnus.com>
 	shifted by 18, without any insertion or extraction function.
 	(insert_cr, extract_cr): Remove.
 
-start-sanitize-arc
-Mon Jul  3 11:54:31 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (ALL_MACHINES): Add arc-dis.o and arc-opc.o.
-
-end-sanitize-arc
 Wed Jun 21 20:05:39 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
 
 	* m68k-dis.c (print_insn_arg, print_indexed): Print "%" before
@@ -2383,13 +2387,6 @@ Wed May 10 14:28:16 1995 Richard Earnshaw (rearnsha@armltd.co.uk)
 	* disassemble.c (disassembler, case bfd_arch_arm): Disassemble for
 	the correct endianness.
 
-start-sanitize-arc
-Sat Apr 29 23:20:05 1995  Doug Evans  <dje@chestnut.cygnus.com>
-
-	* arc-opc.c (arc_opcodes): Add ARC_OPCODE_CONDITIONAL_BRANCH flag.
-	(arc_suffixes): Use ARC_DELAY_{NONE,NORMAL,JUMP}.
-end-sanitize-arc
-
 Mon Apr 24 14:18:05 1995  Jason Molenda   (crash@phydeaux.cygnus.com>
 
 	* sh-opc.h (sh_nibble_type, sh_arg_type): remove trailing , from
@@ -2415,28 +2412,6 @@ Mon Apr 17 12:23:28 1995  Kung Hsu  <kung@rtl.cygnus.com>
 	* m68k-dis.c: Take out #define BREAK_UP_BIG_DECL kludge, because
 	gcc memory hog problem with initializer is fixed.
 
-start-sanitize-arc
-Wed Apr 12 09:04:12 1995  Doug Evans  <dje@canuck.cygnus.com>
-
-	* arc-opc.c (NULL): Define.
-	(arc_operands, insn fields u,s): Delete.
-	(arc_operands, insn fields a,b,c): Mark as signed.
-	(arc_opcodes): No longer const, links computed at run-time.
-	(arc_opcodes, mac/mul insns): Breakout suffixes as we don't handle
-	suffixes that affect the insn code.
-	(arc_opcodes): Resort table to macros are first.
-	(arc_opcodes, ld [b,c] entry): Add %Q to prevent shimms.
-	(arc_opcodes, st [b] entry): Likewise.
-	(arc_opcodes, st [b,d] entry): Fix mask, value.
-	(arc_reg_names): Add entries for r29, r30, r31, r60.
-	(opcode_map, icode_map): New static globals.
-	(arc_opcode_init_tables): Initialize them.
-	(arc_opcode_lookup_asm, arc_opcode_lookup_dis): New functions.
-	(insert_shimmoffset): Signal error if register present.
-	Validate constant.
-	* arc-dis.c (print_insn): Call arc_opcode_lookup_dis.
-end-sanitize-arc
-
 Mon Apr 10 15:55:01 1995  Stan Shebs  <shebs@andros.cygnus.com>
 
 	Merge in support for Mac MPW as a host.
@@ -2462,15 +2437,6 @@ Mon Apr 10 15:55:01 1995  Stan Shebs  <shebs@andros.cygnus.com>
 	* mpw-config.in: New file, MPW version of configure.in.
 	* mpw-make.in: New file, MPW version of Makefile.in.
 
-start-sanitize-arc
-Thu Apr  6 20:36:08 1995  Doug Evans  <dje@chestnut.cygnus.com>
-
-	* arc-dis.c (print_insn): New parameter `big_p'.  Callers updated.
-	Call arc_get_opcode_mach to map bfd mach number to opcode value.
-	(print_insn_*): Pass bfd mach number, not opcode version.
-	* arc-opc.c (arc_get_opcode_mach): New function.
-end-sanitize-arc
-
 Fri Mar 31 14:23:38 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
 
 	* alpha-dis.c (print_insn_alpha): Put empty statement after
@@ -2519,21 +2485,6 @@ Wed Mar  8 02:54:05 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
 	(print_insn_arg): Arrays cacheFieldName and names now const.
 	(print_indexed): Array scales now const.
 
-start-sanitize-arc
-Tue Mar  7 21:14:14 1995  Doug Evans  <dje@chestnut.cygnus.com>
-
-	* arc-dis.c (print_insn_arc_base): Split into big and little fns.
-	(print_insn_arc_{host,graphics,audio}): Likewise.
-	(print_insn): Add prototype.
-	(arc_get_disassembler): New arg `big_p'.  Return little or big
-	print fn accordingly.
-	* arc-opc.c (arc_opcode_init_tables): Init arc_operand_map once.
-	(arc_opcode_supported): Use ARC_OPCODE_CPU to ignore byte order.
-	(arc_opval_supported): Likewise.
-	* disassemble.c (disassembler): Pass big endian flag to
-	arc_get_disassembler.
-end-sanitize-arc
-
 Tue Mar  7 16:41:21 1995  Ian Lance Taylor  <ian@cygnus.com>
 
 	* ppc-opc.c: Sort recently added instructions by minor opcode
@@ -2551,13 +2502,6 @@ Mon Feb 20 23:54:38 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
 	* Makefile.in (ALL_MACHINES):  Add w65-dis.o.
 
-start-sanitize-arc
-Fri Feb 17 12:42:25 1995  Doug Evans  <dje@chestnut.cygnus.com>
-
-	* arc-dis.c (arc_get_disassembler): Change argument to int,
-	one of bfd_mach_arc_xxx.  All callers updated.
-end-sanitize-arc
-
 Thu Feb 16 17:34:41 1995  Ian Lance Taylor  <ian@cygnus.com>
 
 	* mips-opc.c: Add r4650 mul instruction.
@@ -2572,37 +2516,6 @@ Tue Feb 14 13:17:37 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
 	* ppc-opc.c (powerpc_opcodes): Add 403GA opcodes rfci, dccci,
 	mfdcr, mtdcr, icbt, iccci.
 
-start-sanitize-arc
-Mon Feb 13 11:09:17 1995  Doug Evans  <dje@canuck.cygnus.com>
-
-	* arc-dis.c (print_insn): Handle ARC_OPERAND_ADDRESS.
-	* arc-opc.c (arc_operands): New operand 'J' for jump addresses.
-	('L' operand): Mark as ARC_OPERAND_ADDRESS.
-	(arc_opcodes, j insn): Use 'J' operand type, not 'L'.
-	(arc_opcodes, ld/st insns): Fix address writeback operand letter.
-	(insert_absaddr): New function.
-
-Thu Feb  9 19:19:23 1995  Doug Evans  <dje@canuck.cygnus.com>
-
-	* arc-dis.c (print_insn_arc): Rename to print_insn and make static.
-	New argument `cpu', pass it to arc_opcode_init_tables.
-	Document byte order dependencies.  Ignore unsupported insns.
-	(arc_get_disassembler): New function.
-	(print_insn_arc_base, print_insn_arc_host, print_insn_arc_graphics,
-	print_insn_arc_audio): New functions.
-	* arc-opc.c (MULTSHIFT operand): Delete.
-	(UNSIGNED, SATURATION): New operands.
-	(mac, mul, mul64, mulu64): New insns.
-	(ext. asl, asr, lsr, ror): Only available on host and graphics cpus.
-	(padc, padd, pmov, pand, psbc, psub, swap): New insns.
-	(host,graphics,audio extended and auxiliary regs): Define.
-	(ss, sc, mh, ml): New suffixes.
-	(arc_opcode_supported, arc_opval_supported): New functions.
-	(insert_multshift, extract_multshift): Deleted.
-	* disassemble.c (disassembler, case bfd_arch_arc): Call
-	arc_get_disassembler to get disassembler routine.
-end-sanitize-arc
-
 Thu Feb  9 12:28:13 1995  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* i960-dis.c (struct tabent, struct sparse_tabent): Change the
@@ -2655,45 +2568,10 @@ Wed Dec 28 22:15:33 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
 	* h8300-dis.c (bfd_h8_disassemble): Add support for 2 bit
 	immediates.
 
-start-sanitize-arc
-Tue Dec 20 10:36:55 1994  Doug Evans  <dje@canuck.cygnus.com>
-
-	* arc-dis.c (print_insn_arc): Branch offsets are relative to delay
-	slot.
-	* arc-opc.c (extract_reladdr): New function.
-	(insert_reladdr): Store address right-shifted by 2.
-end-sanitize-arc
-
 Tue Dec 20 11:25:12 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
 
 	* mips-opc.c: Add dli as a synonym for li.
 
-start-sanitize-arc
-Mon Dec 19 12:35:51 1994  Doug Evans  <dje@canuck.cygnus.com>
-
-	* arc-opc.c (insertion fns): Pass pointer to value's table entry.
-	All uses changed.
-	(extraction fns): Insn argument now array of two words.  Return pointer
-	to value's table entry.  All uses changed.
-	(arc_opcode_lookup_suffix): Exported for arc-dis.c.
-	(insert_multshift, extract_multshift): New fns.
-	(arc_operands): Add support for cache bypass suffix.  Add support for
-	predefined aux regs.  Modifier bits moved to flags field.
-	(arc_opcodes): Likewise.
-	Add mul/mulu/shift insns.  Syntax of zero/sign extension insns changed.
-	New insn rlc.  Update to syntax in programmer's manual.
-	(arc_reg_names): Fix typo in lp_count.  Add predefined aux regs.
-	(arc_suffixes): New synonyms lo,hs for cs,cc.  New suffix for cache
-	bypass.
-	(arc_opcode_init_tables): New argument to indicate cpu type.
-	(insert_reg): Handle predefined aux regs.
-	(extract_reg): Likewise.
-	(lookup_register): New fn.
-	* arc-dis.c (arc_condition_codes): Deleted.
-	(print_insn_arc): Handle insns with 32 bit immediate constants better.
-	Clean up modifier handling.  Handle predefined aux regs.
-end-sanitize-arc
-
 Thu Dec  8 18:23:31 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
 
 	* alpha-dis.c (print_insn_alpha): Handle call_pal instruction, and
@@ -2706,14 +2584,6 @@ Thu Dec  8 18:23:31 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
 	* m68k-dis.c (print_insn_arg, case 'J'): Handle buscr and pcr
 	control registers.
 
-start-sanitize-arc
-Tue Nov 29 18:02:43 1994  Doug Evans  <dje@canuck.cygnus.com>
-
-	* configure.in: Add ARC support.
-	* disassemble.c: Likewise.
-	* arc-dis.c, arc-opc.c: New files.
-end-sanitize-arc
-
 Wed Nov 23 22:34:51 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
 
 	* sh-opc.h (mov.l gbr): Get direction right.
diff --git a/opcodes/configure b/opcodes/configure
index 69aa06e..22a63b7 100755
--- a/opcodes/configure
+++ b/opcodes/configure
@@ -1312,8 +1312,9 @@ fi
 echo "$ac_t""$am_cv_cygwin32" 1>&6
 CYGWIN32=
 test "$am_cv_cygwin32" = yes && CYGWIN32=yes
+
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1317: checking for executable suffix" >&5
+echo "configure:1318: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1326,7 +1327,7 @@ int main() {
 }
 EOF
 ${CC-cc} -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS am_c_test.c $LIBS 1>&5
-am_cv_exeext=`ls am_c_test.* | grep -v am_c_test.c | sed -e s/am_c_test//`
+am_cv_exeext=`echo am_c_test.* | grep -v am_c_test.c | sed -e s/am_c_test//`
 rm -f am_c_test*
 fi
 
@@ -1342,7 +1343,7 @@ echo "$ac_t""${am_cv_exeext}" 1>&6
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1346: checking for $ac_word" >&5
+echo "configure:1347: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1371,7 +1372,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1375: checking for $ac_word" >&5
+echo "configure:1376: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1419,7 +1420,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1423: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1424: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1429,11 +1430,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 1433 "configure"
+#line 1434 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1453,12 +1454,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1457: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1458: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1462: checking whether we are using GNU C" >&5
+echo "configure:1463: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1468,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1482,7 +1483,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1486: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1487: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1522,7 +1523,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1526: checking for $ac_word" >&5
+echo "configure:1527: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1553,7 +1554,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1557: checking for $ac_word" >&5
+echo "configure:1558: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1584,7 +1585,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1588: checking for $ac_word" >&5
+echo "configure:1589: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1620,7 +1621,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1624: checking how to run the C preprocessor" >&5
+echo "configure:1625: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1635,13 +1636,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1639 "configure"
+#line 1640 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1652,13 +1653,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1656 "configure"
+#line 1657 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1662: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1684,17 +1685,17 @@ for ac_hdr in string.h strings.h stdlib.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1688: checking for $ac_hdr" >&5
+echo "configure:1689: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1693 "configure"
+#line 1694 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1768,9 +1769,7 @@ if test x${all_targets} = xfalse ; then
 	bfd_a29k_arch)		ta="$ta a29k-dis.lo" ;;
 	bfd_alliant_arch)	;;
 	bfd_alpha_arch)		ta="$ta alpha-dis.lo alpha-opc.lo" ;;
-# start-sanitize-arc
 	bfd_arc_arch)		ta="$ta arc-dis.lo arc-opc.lo" ;;
-# end-sanitize-arc
 	bfd_arm_arch)		ta="$ta arm-dis.lo" ;;
 	bfd_convex_arch)	;;
 	bfd_d10v_arch)		ta="$ta d10v-dis.lo d10v-opc.lo" ;;
@@ -2222,7 +2221,6 @@ fi; done
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
-
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
diff --git a/opcodes/configure.in b/opcodes/configure.in
index 2f4c783..b268d70 100644
--- a/opcodes/configure.in
+++ b/opcodes/configure.in
@@ -8,6 +8,9 @@ AC_CANONICAL_SYSTEM
 
 AM_INIT_AUTOMAKE(opcodes, 2.8.2)
 
+dnl Default to a non shared library.  This may be overridden by the
+dnl configure option --enable-shared.
+enable_shared=no
 AM_PROG_LIBTOOL
 
 AC_ARG_ENABLE(targets,
@@ -97,9 +100,7 @@ if test x${all_targets} = xfalse ; then
 	bfd_a29k_arch)		ta="$ta a29k-dis.lo" ;;
 	bfd_alliant_arch)	;;
 	bfd_alpha_arch)		ta="$ta alpha-dis.lo alpha-opc.lo" ;;
-# start-sanitize-arc
 	bfd_arc_arch)		ta="$ta arc-dis.lo arc-opc.lo" ;;
-# end-sanitize-arc
 	bfd_arm_arch)		ta="$ta arm-dis.lo" ;;
 	bfd_convex_arch)	;;
 	bfd_d10v_arch)		ta="$ta d10v-dis.lo d10v-opc.lo" ;;