aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2003-12-05 11:55:01 +0000
committerNick Clifton <nickc@redhat.com>2003-12-05 11:55:01 +0000
commit2acb89ed54605dbf9170091b74d430cf26c1bd28 (patch)
treeb7ec638c0383f10dbf407ba204458d4feb9cbf99
parentd3793eaa607bc918758f22d4939a2080485770e6 (diff)
downloadgdb-2acb89ed54605dbf9170091b74d430cf26c1bd28.zip
gdb-2acb89ed54605dbf9170091b74d430cf26c1bd28.tar.gz
gdb-2acb89ed54605dbf9170091b74d430cf26c1bd28.tar.bz2
Fix SH compilation problems introduced by previous delta
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/config/tc-sh.c22
2 files changed, 17 insertions, 10 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7785fa8..ed96e5d 100644
--- 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 2b8f918..ee51c73 100644
--- 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 */
}