From 1ffcab4b28f01b7b9933adff2c695a826136168c Mon Sep 17 00:00:00 2001 From: Chris Demetriou Date: Fri, 23 Apr 2004 04:50:53 +0000 Subject: [PATCH] 2004-04-22 Chris Demetriou * config/tc-mips.c (md_longopts): Remove -membedded-pic option. (OPTION_MEMBEDDED_PIC): Remove. (OPTION_TRAP, OPTION_BREAK, OPTION_EB, OPTION_EL) (OPTION_FP32, OPTION_GP32, OPTION_CONSTRUCT_FLOATS) (OPTION_NO_CONSTRUCT_FLOATS, OPTIONS_FP64, OPTION_GP64) (OPTION_RELAX_BRANCH, OPTION_NO_RELAX_BRANCH) (OPTION_ELF_BASE): Renumber. (md_parse_option): Remove OPTION_MEMBEDDED_PIC handling. (md_show_usage): Remove mention of -membedded-pic. * doc/as.texinfo: Remove mention of -membedded-pic. --- gas/ChangeLog | 13 +++++++++++++ gas/config/tc-mips.c | 39 +++++++++++++-------------------------- gas/doc/as.texinfo | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index bc7bffe318..1aca510b24 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,16 @@ +2004-04-22 Chris Demetriou + + * config/tc-mips.c (md_longopts): Remove -membedded-pic option. + (OPTION_MEMBEDDED_PIC): Remove. + (OPTION_TRAP, OPTION_BREAK, OPTION_EB, OPTION_EL) + (OPTION_FP32, OPTION_GP32, OPTION_CONSTRUCT_FLOATS) + (OPTION_NO_CONSTRUCT_FLOATS, OPTIONS_FP64, OPTION_GP64) + (OPTION_RELAX_BRANCH, OPTION_NO_RELAX_BRANCH) + (OPTION_ELF_BASE): Renumber. + (md_parse_option): Remove OPTION_MEMBEDDED_PIC handling. + (md_show_usage): Remove mention of -membedded-pic. + * doc/as.texinfo: Remove mention of -membedded-pic. + 2004-04-23 Thiemo Seufer * config/tc-mips.h (USE_GLOBAL_POINTER_OPT): Remove. diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 2c3580413f..a8b22f2dc0 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -10254,38 +10254,36 @@ struct option md_longopts[] = /* Miscellaneous options. */ #define OPTION_MISC_BASE (OPTION_FIX_BASE + 4) -#define OPTION_MEMBEDDED_PIC (OPTION_MISC_BASE + 0) - {"membedded-pic", no_argument, NULL, OPTION_MEMBEDDED_PIC}, -#define OPTION_TRAP (OPTION_MISC_BASE + 1) +#define OPTION_TRAP (OPTION_MISC_BASE + 0) {"trap", no_argument, NULL, OPTION_TRAP}, {"no-break", no_argument, NULL, OPTION_TRAP}, -#define OPTION_BREAK (OPTION_MISC_BASE + 2) +#define OPTION_BREAK (OPTION_MISC_BASE + 1) {"break", no_argument, NULL, OPTION_BREAK}, {"no-trap", no_argument, NULL, OPTION_BREAK}, -#define OPTION_EB (OPTION_MISC_BASE + 3) +#define OPTION_EB (OPTION_MISC_BASE + 2) {"EB", no_argument, NULL, OPTION_EB}, -#define OPTION_EL (OPTION_MISC_BASE + 4) +#define OPTION_EL (OPTION_MISC_BASE + 3) {"EL", no_argument, NULL, OPTION_EL}, -#define OPTION_FP32 (OPTION_MISC_BASE + 5) +#define OPTION_FP32 (OPTION_MISC_BASE + 4) {"mfp32", no_argument, NULL, OPTION_FP32}, -#define OPTION_GP32 (OPTION_MISC_BASE + 6) +#define OPTION_GP32 (OPTION_MISC_BASE + 5) {"mgp32", no_argument, NULL, OPTION_GP32}, -#define OPTION_CONSTRUCT_FLOATS (OPTION_MISC_BASE + 7) +#define OPTION_CONSTRUCT_FLOATS (OPTION_MISC_BASE + 6) {"construct-floats", no_argument, NULL, OPTION_CONSTRUCT_FLOATS}, -#define OPTION_NO_CONSTRUCT_FLOATS (OPTION_MISC_BASE + 8) +#define OPTION_NO_CONSTRUCT_FLOATS (OPTION_MISC_BASE + 7) {"no-construct-floats", no_argument, NULL, OPTION_NO_CONSTRUCT_FLOATS}, -#define OPTION_FP64 (OPTION_MISC_BASE + 9) +#define OPTION_FP64 (OPTION_MISC_BASE + 8) {"mfp64", no_argument, NULL, OPTION_FP64}, -#define OPTION_GP64 (OPTION_MISC_BASE + 10) +#define OPTION_GP64 (OPTION_MISC_BASE + 9) {"mgp64", no_argument, NULL, OPTION_GP64}, -#define OPTION_RELAX_BRANCH (OPTION_MISC_BASE + 11) -#define OPTION_NO_RELAX_BRANCH (OPTION_MISC_BASE + 12) +#define OPTION_RELAX_BRANCH (OPTION_MISC_BASE + 10) +#define OPTION_NO_RELAX_BRANCH (OPTION_MISC_BASE + 11) {"relax-branch", no_argument, NULL, OPTION_RELAX_BRANCH}, {"no-relax-branch", no_argument, NULL, OPTION_NO_RELAX_BRANCH}, /* ELF-specific options. */ #ifdef OBJ_ELF -#define OPTION_ELF_BASE (OPTION_MISC_BASE + 13) +#define OPTION_ELF_BASE (OPTION_MISC_BASE + 12) #define OPTION_CALL_SHARED (OPTION_ELF_BASE + 0) {"KPIC", no_argument, NULL, OPTION_CALL_SHARED}, {"call_shared", no_argument, NULL, OPTION_CALL_SHARED}, @@ -10482,16 +10480,6 @@ md_parse_option (int c, char *arg) mips_opts.ase_mips3d = 0; break; - case OPTION_MEMBEDDED_PIC: - mips_pic = EMBEDDED_PIC; - if (g_switch_seen) - { - as_bad (_("-G may not be used with embedded PIC code")); - return 0; - } - g_switch_value = 0x7fffffff; - break; - case OPTION_FIX_VR4120: mips_fix_vr4120 = 1; break; @@ -14293,7 +14281,6 @@ md_show_usage (FILE *stream) fprintf (stream, _("\ MIPS options:\n\ --membedded-pic generate embedded position independent code\n\ -EB generate big endian output\n\ -EL generate little endian output\n\ -g, -g2 do not remove unneeded NOPs or swap branches\n\ diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo index 554eee7f3b..cee3fbfefe 100644 --- a/gas/doc/as.texinfo +++ b/gas/doc/as.texinfo @@ -353,7 +353,7 @@ gcc(1), ld(1), and the Info entries for @file{binutils} and @file{ld}. @emph{Target MIPS options:} [@b{-nocpp}] [@b{-EL}] [@b{-EB}] [@b{-O}[@var{optimization level}]] [@b{-g}[@var{debug level}]] [@b{-G} @var{num}] [@b{-KPIC}] [@b{-call_shared}] - [@b{-non_shared}] [@b{-xgot}] [@b{--membedded-pic}] + [@b{-non_shared}] [@b{-xgot}] [@b{-mabi}=@var{ABI}] [@b{-32}] [@b{-n32}] [@b{-64}] [@b{-mfp32}] [@b{-mgp32}] [@b{-march}=@var{CPU}] [@b{-mtune}=@var{CPU}] [@b{-mips1}] [@b{-mips2}] [@b{-mips3}] [@b{-mips4}] [@b{-mips5}] [@b{-mips32}] [@b{-mips32r2}]