diff options
-rw-r--r-- | sim/igen/igen.c | 6 | ||||
-rw-r--r-- | sim/m32c/main.c | 5 | ||||
-rw-r--r-- | sim/ppc/dgen.c | 6 | ||||
-rw-r--r-- | sim/ppc/igen.c | 9 | ||||
-rw-r--r-- | sim/rl78/main.c | 4 |
5 files changed, 21 insertions, 9 deletions
diff --git a/sim/igen/igen.c b/sim/igen/igen.c index ba85640..b0a0774 100644 --- a/sim/igen/igen.c +++ b/sim/igen/igen.c @@ -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. */ diff --git a/sim/m32c/main.c b/sim/m32c/main.c index 958ca27..5ed912a 100644 --- a/sim/m32c/main.c +++ b/sim/m32c/main.c @@ -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': diff --git a/sim/ppc/dgen.c b/sim/ppc/dgen.c index a1c1d56..caafe07 100644 --- a/sim/ppc/dgen.c +++ b/sim/ppc/dgen.c @@ -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 diff --git a/sim/ppc/igen.c b/sim/ppc/igen.c index 27b4863..445afb9 100644 --- a/sim/ppc/igen.c +++ b/sim/ppc/igen.c @@ -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 diff --git a/sim/rl78/main.c b/sim/rl78/main.c index c9459c7..ea6ddaa 100644 --- a/sim/rl78/main.c +++ b/sim/rl78/main.c @@ -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) { |