From 2acb89ed54605dbf9170091b74d430cf26c1bd28 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 5 Dec 2003 11:55:01 +0000 Subject: [PATCH] Fix SH compilation problems introduced by previous delta --- gas/ChangeLog | 5 +++++ gas/config/tc-sh.c | 22 ++++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 7785fa843eb..ed96e5d801f 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2003-12-05 Nick Clifton + + * config/tc-sh.c (md_show_usage): Fix compilation errors + introduced by the previous delta. + 2003-12-03 Alexandre Oliva * 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 2b8f918fdb9..ee51c73a89e 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 */ } -- 2.30.2