* lexsup.c (parse_args): Accept -h as a synonym for --soname, for

	Solaris compatibility.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 6f2f0096c83921edd0f6dcdaedc55efcad3a003c..7404098bb900801ea6cc6da041e397659eb8af6d 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 16 11:45:11 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+       * lexsup.c (parse_args): Accept -h as a synonym for --soname, for
+       Solaris compatibility.
+
 Tue Aug 15 17:31:16 1995  Ian Lance Taylor  <ian@cygnus.com>
 
        * ldgram.y (YYDEBUG): If not defined, define as 1.

diff --git a/ld/lexsup.c b/ld/lexsup.c
index dd35a20ace90429ba51e057f7fbd4fbd0f7481f6..1e0889e626188f51748d2ea81731f7411d28b3e4 100644 (file)
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -1,5 +1,5 @@
 /* Parse options for the GNU linker.
-   Copyright (C) 1991, 92, 93, 94 Free Software Foundation, Inc.
+   Copyright (C) 1991, 92, 93, 94, 1995 Free Software Foundation, Inc.
 
 This file is part of GLD, the Gnu Linker.
 
@@ -65,7 +65,7 @@ parse_args (argc, argv)
      as if it were the argument of an option with character code 1.  */
 
   const char *shortopts =
-    "-a:A:B::b:c:de:F::G:giL:l:Mm:NnO:o:R:rSsT:tu:VvXxY:y:z:()";
+    "-a:A:B::b:c:de:F::G:gh:iL:l:Mm:NnO:o:R:rSsT:tu:VvXxY:y:z:()";
 
   /* 150 isn't special; it's just an arbitrary non-ASCII char value.  */
 
@@ -102,7 +102,8 @@ parse_args (argc, argv)
 #define OPTION_VERBOSE                 (OPTION_UR + 1)
 #define OPTION_VERSION                 (OPTION_VERBOSE + 1)
 #define OPTION_WARN_COMMON             (OPTION_VERSION + 1)
-#define OPTION_WARN_ONCE               (OPTION_WARN_COMMON + 1)
+#define OPTION_WARN_CONSTRUCTORS       (OPTION_WARN_COMMON + 1)
+#define OPTION_WARN_ONCE               (OPTION_WARN_CONSTRUCTORS + 1)
 #define OPTION_SPLIT_BY_RELOC          (OPTION_WARN_ONCE + 1)
 #define OPTION_SPLIT_BY_FILE           (OPTION_SPLIT_BY_RELOC + 1)
 #define OPTION_WHOLE_ARCHIVE           (OPTION_SPLIT_BY_FILE + 1)
@@ -155,6 +156,7 @@ parse_args (argc, argv)
     {"verbose", no_argument, NULL, OPTION_VERBOSE},
     {"version", no_argument, NULL, OPTION_VERSION},
     {"warn-common", no_argument, NULL, OPTION_WARN_COMMON},
+    {"warn-constructors", no_argument, NULL, OPTION_WARN_CONSTRUCTORS},
     {"warn-once", no_argument, NULL, OPTION_WARN_ONCE},
     {"split-by-reloc", required_argument, NULL, OPTION_SPLIT_BY_RELOC},
     {"split-by-file", no_argument, NULL, OPTION_SPLIT_BY_FILE},
@@ -380,6 +382,7 @@ parse_args (argc, argv)
        case OPTION_SHARED:
          link_info.shared = true;
          break;
+       case 'h': /* Used on Solaris.  */
        case OPTION_SONAME:
          command_line.soname = optarg;
          break;
@@ -449,6 +452,9 @@ parse_args (argc, argv)
        case OPTION_WARN_COMMON:
          config.warn_common = true;
          break;
+       case OPTION_WARN_CONSTRUCTORS:
+         config.warn_constructors = true;
+         break;
        case OPTION_WARN_ONCE:
          config.warn_once = true;
          break;