From f164aa7f0987375bfb76a52a810231ea69e38ec7 Mon Sep 17 00:00:00 2001 From: Per Fogelstrom Date: Mon, 15 Jul 1996 17:12:25 +0000 Subject: A couple of more fixes. -static *IS* static... --- gnu/usr.bin/binutils/ld/lexsup.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu/usr.bin/binutils/ld/lexsup.c') diff --git a/gnu/usr.bin/binutils/ld/lexsup.c b/gnu/usr.bin/binutils/ld/lexsup.c index 33dd94debd5..8ab6203baa0 100644 --- a/gnu/usr.bin/binutils/ld/lexsup.c +++ b/gnu/usr.bin/binutils/ld/lexsup.c @@ -78,7 +78,8 @@ int parsing_defsym = 0; #define OPTION_SHARED (OPTION_RPATH_LINK + 1) #define OPTION_SONAME (OPTION_SHARED + 1) #define OPTION_SORT_COMMON (OPTION_SONAME + 1) -#define OPTION_STATS (OPTION_SORT_COMMON + 1) +#define OPTION_STATIC (OPTION_SORT_COMMON + 1) +#define OPTION_STATS (OPTION_STATIC + 1) #define OPTION_SYMBOLIC (OPTION_STATS + 1) #define OPTION_TBSS (OPTION_SYMBOLIC + 1) #define OPTION_TDATA (OPTION_TBSS + 1) @@ -210,13 +211,13 @@ static const struct ld_option ld_options[] = '\0', NULL, NULL, ONE_DASH }, { {"call_shared", no_argument, NULL, OPTION_CALL_SHARED}, '\0', NULL, NULL, ONE_DASH }, - { {"Bstatic", no_argument, NULL, OPTION_NON_SHARED}, + { {"Bstatic", no_argument, NULL, OPTION_STATIC}, '\0', NULL, "Do not link against shared libraries", ONE_DASH }, { {"dn", no_argument, NULL, OPTION_NON_SHARED}, '\0', NULL, NULL, ONE_DASH }, { {"non_shared", no_argument, NULL, OPTION_NON_SHARED}, '\0', NULL, NULL, ONE_DASH }, - { {"static", no_argument, NULL, OPTION_NON_SHARED}, + { {"static", no_argument, NULL, OPTION_STATIC}, '\0', NULL, NULL, ONE_DASH }, { {"Bsymbolic", no_argument, NULL, OPTION_SYMBOLIC}, '\0', NULL, "Bind global references locally", ONE_DASH }, @@ -608,6 +609,10 @@ parse_args (argc, argv) case 's': link_info.strip = strip_all; break; + case OPTION_STATIC: + config.dynamic_link = false; + link_info.static_link = true; /*XXX added for mips, check ppc usage */ + break; case OPTION_SHARED: link_info.shared = true; break; -- cgit v1.2.3