X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Flexsup.c;h=06a65e13bd0d7275f22211acd6f70538dba8c4e9;hb=4eee26817d477635365de84831d4d907e7d4ded3;hp=98b77e5887d06a6b25cc93d7332963ee2057d4d8;hpb=22f94ab06cc7802c14175f2f4dcfa73aa983aca2;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/lexsup.c b/ld/lexsup.c index 98b77e5887..06a65e13bd 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c @@ -1,5 +1,5 @@ /* Parse options for the GNU linker. - Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 1998 + Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 1999 Free Software Foundation, Inc. This file is part of GLD, the Gnu Linker. @@ -55,6 +55,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA that might disagree about consts. */ unsigned long strtoul (); +static int is_num PARAMS ((const char *, int, int, int)); static void set_default_dirlist PARAMS ((char *dirlist_ptr)); static void set_section_start PARAMS ((char *sect, char *valstr)); static void help PARAMS ((void)); @@ -69,7 +70,8 @@ int parsing_defsym = 0; #define OPTION_CALL_SHARED (OPTION_ASSERT + 1) #define OPTION_CREF (OPTION_CALL_SHARED + 1) #define OPTION_DEFSYM (OPTION_CREF + 1) -#define OPTION_DYNAMIC_LINKER (OPTION_DEFSYM + 1) +#define OPTION_DEMANGLE (OPTION_DEFSYM + 1) +#define OPTION_DYNAMIC_LINKER (OPTION_DEMANGLE + 1) #define OPTION_EB (OPTION_DYNAMIC_LINKER + 1) #define OPTION_EL (OPTION_EB + 1) #define OPTION_EMBEDDED_RELOCS (OPTION_EL + 1) @@ -77,7 +79,8 @@ int parsing_defsym = 0; #define OPTION_HELP (OPTION_EXPORT_DYNAMIC + 1) #define OPTION_IGNORE (OPTION_HELP + 1) #define OPTION_MAP (OPTION_IGNORE + 1) -#define OPTION_NO_KEEP_MEMORY (OPTION_MAP + 1) +#define OPTION_NO_DEMANGLE (OPTION_MAP + 1) +#define OPTION_NO_KEEP_MEMORY (OPTION_NO_DEMANGLE + 1) #define OPTION_NO_WARN_MISMATCH (OPTION_NO_KEEP_MEMORY + 1) #define OPTION_NOINHIBIT_EXEC (OPTION_NO_WARN_MISMATCH + 1) #define OPTION_NON_SHARED (OPTION_NOINHIBIT_EXEC + 1) @@ -116,6 +119,10 @@ int parsing_defsym = 0; #define OPTION_NO_GC_SECTIONS (OPTION_GC_SECTIONS + 1) #define OPTION_CHECK_SECTIONS (OPTION_NO_GC_SECTIONS + 1) #define OPTION_NO_CHECK_SECTIONS (OPTION_CHECK_SECTIONS + 1) +#define OPTION_MPC860C0 (OPTION_NO_CHECK_SECTIONS + 1) +#define OPTION_NO_UNDEFINED (OPTION_MPC860C0 + 1) +#define OPTION_INIT (OPTION_NO_UNDEFINED + 1) +#define OPTION_FINI (OPTION_INIT + 1) /* The long options. This structure is used for both the option parsing and the help text. */ @@ -260,10 +267,14 @@ static const struct ld_option ld_options[] = '\0', NULL, N_("Output cross reference table"), TWO_DASHES }, { {"defsym", required_argument, NULL, OPTION_DEFSYM}, '\0', N_("SYMBOL=EXPRESSION"), N_("Define a symbol"), TWO_DASHES }, + { {"demangle", no_argument, NULL, OPTION_DEMANGLE}, + '\0', NULL, N_("Demangle symbol names"), TWO_DASHES }, { {"dynamic-linker", required_argument, NULL, OPTION_DYNAMIC_LINKER}, '\0', N_("PROGRAM"), N_("Set the dynamic linker to use"), TWO_DASHES }, { {"embedded-relocs", no_argument, NULL, OPTION_EMBEDDED_RELOCS}, '\0', NULL, N_("Generate embedded relocs"), TWO_DASHES}, + { {"fini", required_argument, NULL, OPTION_FINI}, + '\0', N_("SYMBOL"), N_("Call SYMBOL at unload-time"), ONE_DASH }, { {"force-exe-suffix", no_argument, NULL, OPTION_FORCE_EXE_SUFFIX}, '\0', NULL, N_("Force generation of file with .exe suffix"), TWO_DASHES}, { {"gc-sections", no_argument, NULL, OPTION_GC_SECTIONS}, @@ -274,10 +285,16 @@ static const struct ld_option ld_options[] = TWO_DASHES }, { {"help", no_argument, NULL, OPTION_HELP}, '\0', NULL, N_("Print option help"), TWO_DASHES }, + { {"init", required_argument, NULL, OPTION_INIT}, + '\0', N_("SYMBOL"), N_("Call SYMBOL at load-time"), ONE_DASH }, { {"Map", required_argument, NULL, OPTION_MAP}, '\0', N_("FILE"), N_("Write a map file"), ONE_DASH }, + { {"no-demangle", no_argument, NULL, OPTION_NO_DEMANGLE }, + '\0', NULL, N_("Do not demangle symbol names"), TWO_DASHES }, { {"no-keep-memory", no_argument, NULL, OPTION_NO_KEEP_MEMORY}, '\0', NULL, N_("Use less memory and more disk I/O"), TWO_DASHES }, + { {"no-undefined", no_argument, NULL, OPTION_NO_UNDEFINED}, + '\0', NULL, N_("Allow no undefined symbols"), TWO_DASHES }, { {"no-warn-mismatch", no_argument, NULL, OPTION_NO_WARN_MISMATCH}, '\0', NULL, N_("Don't warn about mismatched input files"), TWO_DASHES}, { {"no-whole-archive", no_argument, NULL, OPTION_NO_WHOLE_ARCHIVE}, @@ -331,7 +348,7 @@ static const struct ld_option ld_options[] = '\0', N_("FILE"), N_("Read version information script"), TWO_DASHES }, { {"version-exports-section", required_argument, NULL, OPTION_VERSION_EXPORTS_SECTION }, - '\0', N_("SYMBOL"), N_("Take export symbols list from .exports, using SYMBOL as the version."), + '\0', N_("SYMBOL"), N_("Take export symbols list from .exports, using\n\t\t\t\tSYMBOL as the version."), TWO_DASHES }, { {"warn-common", no_argument, NULL, OPTION_WARN_COMMON}, '\0', NULL, N_("Warn about duplicate common symbols"), TWO_DASHES }, @@ -348,11 +365,40 @@ static const struct ld_option ld_options[] = { {"whole-archive", no_argument, NULL, OPTION_WHOLE_ARCHIVE}, '\0', NULL, N_("Include all objects from following archives"), TWO_DASHES }, { {"wrap", required_argument, NULL, OPTION_WRAP}, - '\0', N_("SYMBOL"), N_("Use wrapper functions for SYMBOL"), TWO_DASHES } + '\0', N_("SYMBOL"), N_("Use wrapper functions for SYMBOL"), TWO_DASHES }, + { {"mpc860c0", optional_argument, NULL, OPTION_MPC860C0}, + '\0', N_("[=WORDS]"), N_("Modify problematic branches in last WORDS (1-10,\n\t\t\t\tdefault 5) words of a page"), TWO_DASHES } }; #define OPTION_COUNT ((int) (sizeof ld_options / sizeof ld_options[0])) +/* Test STRING for containing a string of digits that form a number + between MIN and MAX. The return value is the number or ERR. */ + +static int +is_num (string, min, max, err) + const char *string; + int min; + int max; + int err; +{ + int result = 0; + + for (; *string; ++string) + { + if (! isdigit (*string)) + { + result = err; + break; + } + result = result * 10 + (*string - '0'); + } + if (result < min || result > max) + result = err; + + return result; +} + void parse_args (argc, argv) int argc; @@ -470,6 +516,9 @@ parse_args (argc, argv) switch (optc) { default: + fprintf (stderr, + _("%s: use the --help option for usage information\n"), + program_name); xexit (1); case 1: /* File name. */ lang_add_input_file (optarg, lang_input_file_is_file_enum, @@ -536,6 +585,9 @@ parse_args (argc, argv) parsing_defsym = 0; lex_string = NULL; break; + case OPTION_DEMANGLE: + demangling = true; + break; case OPTION_DYNAMIC_LINKER: command_line.interpreter = optarg; break; @@ -627,12 +679,18 @@ parse_args (argc, argv) config.magic_demand_paged = false; config.dynamic_link = false; break; + case OPTION_NO_DEMANGLE: + demangling = false; + break; case OPTION_NO_GC_SECTIONS: command_line.gc_sections = false; break; case OPTION_NO_KEEP_MEMORY: link_info.keep_memory = false; break; + case OPTION_NO_UNDEFINED: + link_info.no_undefined = true; + break; case OPTION_NO_WARN_MISMATCH: command_line.warn_mismatch = false; break; @@ -896,7 +954,7 @@ the GNU General Public License. This program has absolutely no warranty.\n")); ignored. Someday we should handle it correctly. FIXME. */ break; case OPTION_SPLIT_BY_RELOC: - config.split_by_reloc = atoi (optarg); + config.split_by_reloc = strtoul (optarg, NULL, 0); break; case OPTION_SPLIT_BY_FILE: config.split_by_file = true; @@ -929,7 +987,32 @@ the GNU General Public License. This program has absolutely no warranty.\n")); lang_leave_group (); ingroup = 0; break; + case OPTION_MPC860C0: + link_info.mpc860c0 = 20; /* default value (in bytes) */ + if (optarg) + { + unsigned words; + + words = is_num (optarg, 1, 10, 0); + if (words == 0) + { + fprintf (stderr, + _("%s: Invalid argument to option \"mpc860c0\"\n"), + program_name); + xexit (1); + } + link_info.mpc860c0 = words * 4; /* convert words to bytes */ + } + command_line.relax = true; + break; + case OPTION_INIT: + link_info.init_function = optarg; + break; + + case OPTION_FINI: + link_info.fini_function = optarg; + break; } } @@ -1060,6 +1143,8 @@ help () } } + /* Note: Various tools (such as libtool) depend upon the + format of the listings below - do not change them. */ /* xgettext:c-format */ printf (_("%s: supported targets:"), program_name); targets = bfd_target_list ();