From d3fb7ca2141c52427552a5834c13e84429919bd6 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Sat, 4 Oct 2003 12:07:27 +0000 Subject: [PATCH] (std_shortopts): Remove 'f'. (std_longopts): Add 'f'. Doing this prevents -f being acecpted as an alias for -f --- gas/ChangeLog | 6 ++++++ gas/as.c | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 970f0bb..829cf8c 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2003-10-04 Nick Clifton + + * as.c (std_shortopts): Remove 'f'. + (std_longopts): Add 'f'. Doing this prevents -f being + acecpted as an alias for -f. + 2003-10-04 Danny Smith * config/obj-coff.c (obj_coff_section [BEF_ASSEMBLER]): diff --git a/gas/as.c b/gas/as.c index 5ff1403..459ce0c 100644 --- a/gas/as.c +++ b/gas/as.c @@ -375,7 +375,7 @@ parse_args (pargc, pargv) /* -K is not meaningful if .word is not being hacked. */ 'K', #endif - 'L', 'M', 'R', 'W', 'Z', 'f', 'a', ':', ':', 'D', 'I', ':', 'o', ':', + 'L', 'M', 'R', 'W', 'Z', 'a', ':', ':', 'D', 'I', ':', 'o', ':', #ifndef VMS /* -v takes an argument on VMS, so we don't make it a generic option. */ @@ -449,6 +449,12 @@ parse_args (pargc, pargv) #define OPTION_NOEXECSTACK (OPTION_STD_BASE + 21) {"noexecstack", no_argument, NULL, OPTION_NOEXECSTACK}, #endif + /* Treat '-f' as a long switch so that getopt will not accept + -f as a synonym for -f. This can cause confusion + when -f switches are passed through from the compiler. + FIXME - should we handle other single character switches in the + same way ? */ + {"f", no_argument, NULL, 'f'}, #define OPTION_WARN_FATAL (OPTION_STD_BASE + 22) {"fatal-warnings", no_argument, NULL, OPTION_WARN_FATAL} /* When you add options here, check that they do not collide with -- 2.7.4