Fix SH compilation problems introduced by previous delta

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7785fa843eb4bee3b5d92d30773fcb2788074695..ed96e5d801f27431079b5a3b2fa66cc4c61980f4 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-05  Nick Clifton  <nickc@redhat.com>
+
+       * config/tc-sh.c (md_show_usage): Fix compilation errors
+       introduced by the previous delta.
+
 2003-12-03  Alexandre Oliva  <aoliva@redhat.com>
 
        * config/tc-sh.c: Add support for sh4a and no-fpu variants,

diff --git a/gas/config/tc-sh.c b/gas/config/tc-sh.c
index 2b8f918fdb9867019de8864d508e98e7673af532..ee51c73a89ea3262a7fd2434a888d74dcc4d2ea4 100644 (file)
--- a/gas/config/tc-sh.c
+++ b/gas/config/tc-sh.c
@@ -2973,21 +2973,16 @@ SH options:\n\
 -relax                 alter jump instructions for long displacements\n\
 -small                 align sections to 4 byte boundaries, not 16\n\
 -dsp                   enable sh-dsp insns, and disable floating-point ISAs.\n"));
+#ifdef HAVE_SH64
   fprintf (stream, _("\
 -isa=[sh4\n\
     | sh4a\n\
     | dsp              same as '-dsp'\n\
-    | fp\n"
-#ifdef HAVE_SH64
-"\
-    | shmedia          set default instruction set for SH64\n\
+    | fp\n\
+    | shmedia          set as the default instruction set for SH64\n\
     | SHmedia\n\
     | shcompact\n\
-    | SHcompact\n"
-#endif
-"\
-    | any]\n"));
-#ifdef HAVE_SH64
+    | SHcompact\n"));
   fprintf (stream, _("\
 -abi=[32|64]           set size of expanded SHmedia operands and object\n\
                        file type\n\
@@ -2997,7 +2992,14 @@ SH options:\n\
                        constants and SHcompact code\n\
 -no-expand             do not expand MOVI, PT, PTA or PTB instructions\n\
 -expand-pt32           with -abi=64, expand PT, PTA and PTB instructions\n\
-                       to 32 bits only"));
+                       to 32 bits only\n"));
+#else
+  fprintf (stream, _("\
+-isa=[sh4\n\
+    | sh4a\n\
+    | dsp              same as '-dsp'\n\
+    | fp\n\
+    | any]\n"));
 #endif /* HAVE_SH64 */
 }
 \f