OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Keep track of last optind value, and rename a couple of functions 

for consistency.
This commit is contained in:
Alan Modra 2000-08-04 04:41:33 +00:00
parent 1dd4193b86
commit 4b209b2234
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ld/ChangeLog
View File

@ -1,3 +1,11 @@
2000-08-04 Alan Modra <alan@linuxcare.com.au>
* emultempl/elf32.em (gld_${EMULATION_NAME}_parse_args): Rename to
gld${EMULATION_NAME}_parse_args for consistency. Combine
lastoptind and prevoptind vars, and keep track of last optind.
(gld_${EMULATION_NAME}_list_options): Rename to
gld${EMULATION_NAME}_list_options.
2000-08-03 Rodney Brown <RodneyBrown@pmsc.com> 2000-08-03 Rodney Brown <RodneyBrown@pmsc.com>
* configure.tgt: Select targ_emul=elf_i386 for Unixware 7 * configure.tgt: Select targ_emul=elf_i386 for Unixware 7

38
ld/emultempl/elf32.em
View File

@ -1250,7 +1250,7 @@ fi
if test -n "$PARSE_AND_LIST_ARGS_CASES" -o x"$GENERATE_SHLIB_SCRIPT" = xyes; then if test -n "$PARSE_AND_LIST_ARGS_CASES" -o x"$GENERATE_SHLIB_SCRIPT" = xyes; then
if test x"$LDEMUL_PARSE_ARGS" != xgld_"$EMULATION_NAME"_parse_args; then if test x"$LDEMUL_PARSE_ARGS" != xgld"$EMULATION_NAME"_parse_args; then
if test -n "$PARSE_AND_LIST_PROLOGUE" ; then if test -n "$PARSE_AND_LIST_PROLOGUE" ; then
cat >>e${EMULATION_NAME}.c <<EOF cat >>e${EMULATION_NAME}.c <<EOF
@ -1291,23 +1291,25 @@ cat >>e${EMULATION_NAME}.c <<EOF
}; };
static int gld_${EMULATION_NAME}_parse_args PARAMS ((int, char **)); static int gld${EMULATION_NAME}_parse_args PARAMS ((int, char **));
static int static int
gld_${EMULATION_NAME}_parse_args (argc, argv) gld${EMULATION_NAME}_parse_args (argc, argv)
int argc; int argc;
char ** argv; char ** argv;
{ {
int longind, optc; int longind;
int prevoptind = optind; int optc;
static int prevoptind = -1;
int prevopterr = opterr; int prevopterr = opterr;
int wanterror; int wanterror;
static int lastoptind = -1;
if (lastoptind != optind) if (prevoptind != optind)
opterr = 0; opterr = 0;
wanterror = opterr; wanterror = opterr;
prevoptind = optind;
optc = getopt_long_only (argc, argv, optc = getopt_long_only (argc, argv,
"-${PARSE_AND_LIST_SHORTOPTS}z:", longopts, "-${PARSE_AND_LIST_SHORTOPTS}z:", longopts,
&longind); &longind);
@ -1318,7 +1320,7 @@ gld_${EMULATION_NAME}_parse_args (argc, argv)
default: default:
if (wanterror) if (wanterror)
xexit (1); xexit (1);
optind = prevoptind; optind = prevoptind;
return 0; return 0;
EOF EOF
@ -1378,13 +1380,13 @@ cat >>e${EMULATION_NAME}.c <<EOF
EOF EOF
fi fi
if test x"$LDEMUL_LIST_OPTIONS" != xgld_"$EMULATION_NAME"_list_options; then if test x"$LDEMUL_LIST_OPTIONS" != xgld"$EMULATION_NAME"_list_options; then
cat >>e${EMULATION_NAME}.c <<EOF cat >>e${EMULATION_NAME}.c <<EOF
static void gld_${EMULATION_NAME}_list_options PARAMS ((FILE * file)); static void gld${EMULATION_NAME}_list_options PARAMS ((FILE * file));
static void static void
gld_${EMULATION_NAME}_list_options (file) gld${EMULATION_NAME}_list_options (file)
FILE * file; FILE * file;
{ {
EOF EOF
@ -1424,14 +1426,14 @@ EOF
fi fi
fi fi
else else
if test x"$LDEMUL_PARSE_ARGS" != xgld_"$EMULATION_NAME"_parse_args; then if test x"$LDEMUL_PARSE_ARGS" != xgld"$EMULATION_NAME"_parse_args; then
cat >>e${EMULATION_NAME}.c <<EOF cat >>e${EMULATION_NAME}.c <<EOF
#define gld_${EMULATION_NAME}_parse_args NULL #define gld${EMULATION_NAME}_parse_args NULL
EOF EOF
fi fi
if test x"$LDEMUL_LIST_OPTIONS" != xgld_"$EMULATION_NAME"_list_options; then if test x"$LDEMUL_LIST_OPTIONS" != xgld"$EMULATION_NAME"_list_options; then
cat >>e${EMULATION_NAME}.c <<EOF cat >>e${EMULATION_NAME}.c <<EOF
#define gld_${EMULATION_NAME}_list_options NULL #define gld${EMULATION_NAME}_list_options NULL
EOF EOF
fi fi
fi fi
@ -1457,9 +1459,9 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation =
${LDEMUL_OPEN_DYNAMIC_ARCHIVE-gld${EMULATION_NAME}_open_dynamic_archive}, ${LDEMUL_OPEN_DYNAMIC_ARCHIVE-gld${EMULATION_NAME}_open_dynamic_archive},
${LDEMUL_PLACE_ORPHAN-gld${EMULATION_NAME}_place_orphan}, ${LDEMUL_PLACE_ORPHAN-gld${EMULATION_NAME}_place_orphan},
${LDEMUL_SET_SYMBOLS-NULL}, ${LDEMUL_SET_SYMBOLS-NULL},
${LDEMUL_PARSE_ARGS-gld_${EMULATION_NAME}_parse_args}, ${LDEMUL_PARSE_ARGS-gld${EMULATION_NAME}_parse_args},
${LDEMUL_UNRECOGNIZED_FILE-NULL}, ${LDEMUL_UNRECOGNIZED_FILE-NULL},
${LDEMUL_LIST_OPTIONS-gld_${EMULATION_NAME}_list_options}, ${LDEMUL_LIST_OPTIONS-gld${EMULATION_NAME}_list_options},
${LDEMUL_RECOGNIZED_FILE-NULL}, ${LDEMUL_RECOGNIZED_FILE-NULL},
${LDEMUL_FIND_POTENTIAL_LIBRARIES-NULL}, ${LDEMUL_FIND_POTENTIAL_LIBRARIES-NULL},
}; };