From: Daniel Jacobowitz Date: Fri, 20 Dec 2002 20:12:10 +0000 (+0000) Subject: * as.c (std_longopts): Duplicate --keep-locals entry in order to X-Git-Tag: binutils-2_13_2~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a8c7b14b94165dc328bb3f49faeeef990878a1e;p=thirdparty%2Fbinutils-gdb.git * as.c (std_longopts): Duplicate --keep-locals entry in order to prevent it being confused with -k. * emultempl/pe.em (longopts): Duplicate entry for --compact-implib so that it is not confused with -c. --- diff --git a/gas/ChangeLog b/gas/ChangeLog index c26394d0716..181fd99a76b 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -3,6 +3,11 @@ * doc/as.texinfo (Invoking): Typo fix. * config/tc-tic54x.c (encode_operand): Comment typo fix. +2002-12-17 Nick Clifton + + * as.c (std_longopts): Duplicate --keep-locals entry in order to + prevent it being confused with -k. + 2002-11-30 Kaz Kojima * config/tc-sh.c (md_apply_fix3): Take account of fx_offset diff --git a/gas/as.c b/gas/as.c index 346ecc84c03..f0a89c5ed1f 100644 --- a/gas/as.c +++ b/gas/as.c @@ -374,6 +374,10 @@ parse_args (pargc, pargv) static const struct option std_longopts[] = { #define OPTION_HELP (OPTION_STD_BASE) {"help", no_argument, NULL, OPTION_HELP}, + /* getopt allows abbreviations, so we do this to stop it from + treating -k as an abbreviation for --keep-locals. Some + ports use -k to enable PIC assembly. */ + {"keep-locals", no_argument, NULL, 'L'}, {"keep-locals", no_argument, NULL, 'L'}, {"mri", no_argument, NULL, 'M'}, #define OPTION_NOCPP (OPTION_STD_BASE + 1) diff --git a/ld/ChangeLog b/ld/ChangeLog index 86ca4821470..d25783005ad 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2002-12-17 Nick Clifton + + * emultempl/pe.em (longopts): Duplicate entry for --compact-implib + so that it is not confused with -c. + 2002-12-10 Alan Modra * emultempl/elf32.em (struct orphan_save): Add os_tail field. diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em index 474b9845487..ec1514fba2a 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em @@ -255,6 +255,9 @@ static struct option longopts[] = { {"disable-stdcall-fixup", no_argument, NULL, OPTION_DISABLE_STDCALL_FIXUP}, {"out-implib", required_argument, NULL, OPTION_IMPLIB_FILENAME}, {"warn-duplicate-exports", no_argument, NULL, OPTION_WARN_DUPLICATE_EXPORTS}, + /* getopt() allows abbreviations, so we do this to stop it from + treating -c as an abbreviation for these --compat-implib. */ + {"compat-implib", no_argument, NULL, OPTION_IMP_COMPAT}, {"compat-implib", no_argument, NULL, OPTION_IMP_COMPAT}, {"enable-auto-image-base", no_argument, NULL, OPTION_ENABLE_AUTO_IMAGE_BASE}, {"disable-auto-image-base", no_argument, NULL, OPTION_DISABLE_AUTO_IMAGE_BASE},