Fix problems with new EXACTLY_TWO_DASHES command line switch option.
This commit is contained in:
parent
67db5ab439
commit
0fc3347a5c
@ -1,3 +1,8 @@
|
||||
2000-12-31 Nick Clifton <nickc@redhat.com>
|
||||
|
||||
* lexsup.c (parse_args): Set opterr to 0 and detect unparsed long
|
||||
options by checking for a return value of '?' not -1.
|
||||
|
||||
2000-12-28 Nick Clifton <nickc@redhat.com>
|
||||
|
||||
* lexsup.c (struct ld_option): Add new enum value:
|
||||
|
14
ld/lexsup.c
14
ld/lexsup.c
@ -543,14 +543,22 @@ parse_args (argc, argv)
|
||||
|
||||
/* getopt_long_only is like getopt_long, but '-' as well as '--'
|
||||
can indicate a long option. */
|
||||
opterr = 0;
|
||||
optc = getopt_long_only (argc, argv, shortopts, longopts, &longind);
|
||||
if (optc == -1)
|
||||
optc = getopt_long (argc, argv, shortopts, really_longopts, &longind);
|
||||
|
||||
if (optc == '?')
|
||||
{
|
||||
--optind;
|
||||
optc = getopt_long (argc, argv, shortopts, really_longopts, &longind);
|
||||
}
|
||||
|
||||
if (optc == -1)
|
||||
break;
|
||||
|
||||
switch (optc)
|
||||
{
|
||||
case '?':
|
||||
fprintf (stderr, _("%s: unrecognized option '%s'\n"),
|
||||
program_name, argv[optind - 1]);
|
||||
default:
|
||||
fprintf (stderr,
|
||||
_("%s: use the --help option for usage information\n"),
|
||||
|
@ -1,3 +1,7 @@
|
||||
2000-12-31 Nick Clifton <nickc@redhat.com>
|
||||
|
||||
* ld-srec/srec.exp: Use --oformat instead of -oformat.
|
||||
|
||||
2000-12-09 Nick Clifton <nickc@redhat.com>
|
||||
|
||||
* ld-selective/selective.exp: Link in libgcc when target is v850.
|
||||
|
@ -237,7 +237,7 @@ proc run_srec_test { test objs } {
|
||||
set flags "$flags --defsym __gccmain=0"
|
||||
|
||||
# ARM targets cannot convert format in the linker
|
||||
# using the -oformat command line switch
|
||||
# using the --oformat command line switch
|
||||
setup_xfail "*arm*-*-*"
|
||||
setup_xfail "xscale-*-*"
|
||||
setup_xfail "thumb-*-*"
|
||||
@ -259,7 +259,7 @@ proc run_srec_test { test objs } {
|
||||
}
|
||||
|
||||
if { ![ld_simple_link $ld tmpdir/sr1 "$flags $objs"] \
|
||||
|| ![ld_simple_link $ld tmpdir/sr2.sr "$flags -oformat srec $objs"] } {
|
||||
|| ![ld_simple_link $ld tmpdir/sr2.sr "$flags --oformat srec $objs"] } {
|
||||
setup_xfail "hppa*-*-*elf*"
|
||||
fail $test
|
||||
return
|
||||
|
Loading…
Reference in New Issue
Block a user