mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-27 12:03:41 +08:00
sim, sim/{m32c,ppc,rl78}: Use getopt_long
Because of a Libiberty hack, getopt on GNU libc (2.25 or earlier) is
currently unusable on sim, causing a regression on CentOS 7.
This is caused as follows:
1. If HAVE_DECL_GETOPT is defined (getopt declaration with known prototype
is detected while configuration), a declaration of getopt in
"include/getopt.h" is suppressed.
The author started to define HAVE_DECL_GETOPT in sim with the commit
340aa4f687
("sim: Check known getopt definition existence").
2. GNU libc (2.25 or earlier)'s <unistd.h> includes <getopt.h> with a
special purpose macro defined to declare only getopt function but due
to include path (not tested while configuration), it causes <unistd.h>
to include Libiberty's "include/getopt.h".
3. If both 1. and 2. are satisfied, despite that <unistd.h> tries to
declare getopt by including <getopt.h>, "include/getopt.h" does not do
so, causing getopt function undeclared.
Getting rid of "include/getopt.h" (e.g. renaming this header file) is the
best solution to avoid hacking but as a short-term solution, this commit
replaces getopt with getopt_long under sim/.
This commit is contained in:
parent
bb94ac4f95
commit
dd6c5a9217
@ -989,6 +989,7 @@ main (int argc, char **argv, char **envp)
|
||||
char *real_file_name = NULL;
|
||||
int is_header = 0;
|
||||
int ch;
|
||||
static const struct option longopts[] = { { 0 } };
|
||||
lf *standard_out =
|
||||
lf_open ("-", "stdout", lf_omit_references, lf_is_text, "igen");
|
||||
|
||||
@ -1162,8 +1163,9 @@ main (int argc, char **argv, char **envp)
|
||||
printf (" -t <output-file> output itable\n");
|
||||
}
|
||||
|
||||
while ((ch = getopt (argc, argv,
|
||||
"B:D:F:G:H:I:M:N:P:T:W:o:k:i:n:hc:d:e:m:r:s:t:f:x"))
|
||||
while ((ch = getopt_long (argc, argv,
|
||||
"B:D:F:G:H:I:M:N:P:T:W:o:k:i:n:hc:d:e:m:r:s:t:f:x",
|
||||
longopts, NULL))
|
||||
!= -1)
|
||||
{
|
||||
#if 0 /* For debugging. */
|
||||
|
@ -29,6 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
#include <setjmp.h>
|
||||
#include <signal.h>
|
||||
#include <sys/types.h>
|
||||
#include <getopt.h>
|
||||
|
||||
#ifdef HAVE_SYS_SOCKET_H
|
||||
#ifdef HAVE_NETINET_IN_H
|
||||
@ -135,12 +136,14 @@ main (int argc, char **argv)
|
||||
#ifdef HAVE_networking
|
||||
char *console_port_s = 0;
|
||||
#endif
|
||||
static const struct option longopts[] = { { 0 } };
|
||||
|
||||
setbuf (stdout, 0);
|
||||
|
||||
in_gdb = 0;
|
||||
|
||||
while ((o = getopt (argc, argv, "tc:vdm:C")) != -1)
|
||||
while ((o = getopt_long (argc, argv, "tc:vdm:C", longopts, NULL))
|
||||
!= -1)
|
||||
switch (o)
|
||||
{
|
||||
case 't':
|
||||
|
@ -271,6 +271,7 @@ main(int argc,
|
||||
{
|
||||
lf_file_references file_references = lf_include_references;
|
||||
spreg_table *sprs = NULL;
|
||||
static const struct option longopts[] = { { 0 } };
|
||||
char *real_file_name = NULL;
|
||||
int is_header = 0;
|
||||
int ch;
|
||||
@ -284,8 +285,9 @@ main(int argc,
|
||||
printf("-L Suppress cpp line numbering in output files\n");
|
||||
}
|
||||
|
||||
|
||||
while ((ch = getopt(argc, argv, "hLsn:r:p:")) != -1) {
|
||||
while ((ch = getopt_long (argc, argv, "hLsn:r:p:", longopts, NULL))
|
||||
!= -1)
|
||||
{
|
||||
#if 0 /* For debugging. */
|
||||
fprintf(stderr, "\t-%c %s\n", ch, ( optarg ? optarg : ""));
|
||||
#endif
|
||||
|
@ -351,6 +351,7 @@ main(int argc,
|
||||
filter *filters = NULL;
|
||||
insn_table *instructions = NULL;
|
||||
table_include *includes = NULL;
|
||||
static const struct option longopts[] = { { 0 } };
|
||||
char *real_file_name = NULL;
|
||||
int is_header = 0;
|
||||
int ch;
|
||||
@ -390,9 +391,11 @@ main(int argc,
|
||||
printf(" -f <output-file> output support functions\n");
|
||||
}
|
||||
|
||||
while ((ch = getopt(argc, argv,
|
||||
"F:EI:RSLJT:CB:H:N:o:k:i:n:hc:d:m:s:t:f:"))
|
||||
!= -1) {
|
||||
while (
|
||||
(ch = getopt_long (argc, argv, "F:EI:RSLJT:CB:H:N:o:k:i:n:hc:d:m:s:t:f:",
|
||||
longopts, NULL))
|
||||
!= -1)
|
||||
{
|
||||
#if 0 /* For debugging. */
|
||||
fprintf(stderr, "\t-%c %s\n", ch, (optarg ? optarg : ""));
|
||||
#endif
|
||||
|
@ -64,10 +64,12 @@ main (int argc, char **argv)
|
||||
int save_trace;
|
||||
bfd *prog;
|
||||
int rc;
|
||||
static const struct option longopts[] = { { 0 } };
|
||||
|
||||
xmalloc_set_program_name (argv[0]);
|
||||
|
||||
while ((o = getopt (argc, argv, "tvdr:D:M:")) != -1)
|
||||
while ((o = getopt_long (argc, argv, "tvdr:D:M:", longopts, NULL))
|
||||
!= -1)
|
||||
{
|
||||
switch (o)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user