From cbbf96082238c535673cea161a643ab9200482f4 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 15 Jun 1994 21:04:21 +0000 Subject: [PATCH] * ldmain.c (get_emulation): Ignore -m486 for Linux compatibility. * lexsup.c (parse_args): Ignore -qmagic for Linux compatibility. --- ld/ChangeLog | 3 +++ ld/ldmain.c | 6 ++++++ ld/lexsup.c | 1 + 3 files changed, 10 insertions(+) diff --git a/ld/ChangeLog b/ld/ChangeLog index 928908b393f..f3f5d6eee38 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,8 @@ Wed Jun 15 01:54:54 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + * ldmain.c (get_emulation): Ignore -m486 for Linux compatibility. + * lexsup.c (parse_args): Ignore -qmagic for Linux compatibility. + Let the user change the dynamic linker used by ELF code. * ld.h (args_type): Add new field interpreter. * lexsup.c (parse_args): Add dynamic-linker to longopts, and diff --git a/ld/ldmain.c b/ld/ldmain.c index 82b5a401c92..5b2e370f8a5 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -367,6 +367,12 @@ get_emulation (argc, argv) the arguments and hope that nobody ever creates emulations named ips1, ips2 or ips3. */ } + else if (strcmp (argv[i], "-m486") == 0) + { + /* FIXME: The argument -m486 is passed to the linker on + some Linux systems. Hope that nobody creates an + emulation named 486. */ + } else { /* -mEMUL */ diff --git a/ld/lexsup.c b/ld/lexsup.c index 0b52a1116c0..a4c847f1ad2 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c @@ -98,6 +98,7 @@ parse_args (argc, argv) {"non_shared", no_argument, NULL, OPTION_NON_SHARED}, {"oformat", required_argument, NULL, OPTION_OFORMAT}, {"Qy", no_argument, NULL, OPTION_IGNORE}, + {"qmagic", no_argument, NULL, OPTION_IGNORE}, /* Linux compatibility. */ {"relax", no_argument, NULL, OPTION_RELAX}, {"retain-symbols-file", no_argument, NULL, OPTION_RETAIN_SYMBOLS_FILE}, {"sort-common", no_argument, NULL, OPTION_SORT_COMMON}, -- 2.30.2