Check symbols with undefine version.

10 files changed, 40 insertions, 12 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index a587652..1afde2a 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,17 @@
+2002-08-07  H.J. Lu <hjl@gnu.org>
+
+	* ld.texinfo: Document --no-undefined-version.
+
+	* ldlang.c (lang_new_vers_pattern): Set the `symver' and
+	`script.' fields to 0.
+
+	* ldmain.c (main): Initialize the allow_undefined_version to
+	true.
+
+	* lexsup.c (OPTION_NO_UNDEFINED_VERSION): New.
+	(ld_options): Add --no-undefined-version.
+	(parse_args): Support OPTION_NO_UNDEFINED_VERSION.
+
 2002-08-07  Nick Clifton  <nickc@redhat.com>
 
 	* emultempl/armelf.em (arm_elf_before_allocation): Only search for
diff --git a/ld/ld.texinfo b/ld/ld.texinfo
index dadc75b..12030c0 100644
--- a/ld/ld.texinfo
+++ b/ld/ld.texinfo
@@ -1102,6 +1102,12 @@ select which function is most appropriate for the current architecture.
 I.E. dynamically select an appropriate memset function.  Apparently it
 is also normal for HPPA shared libraries to have undefined symbols.
 
+@kindex --no-undefined-version
+@item --no-undefined-version
+Normally when a symbol has an undefined version, the linker will ignore
+it. This option disallows symbols with undefined version and a fatal error
+will be issued instead.
+
 @kindex --no-warn-mismatch
 @item --no-warn-mismatch
 Normally @command{ld} will give an error if you try to link together input
diff --git a/ld/ldlang.c b/ld/ldlang.c
index c260829..a777e5a 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -5132,6 +5132,8 @@ lang_new_vers_pattern (orig, new, lang)
   ret = (struct bfd_elf_version_expr *) xmalloc (sizeof *ret);
   ret->next = orig;
   ret->pattern = new;
+  ret->symver = 0;
+  ret->script = 0;
 
   if (lang == NULL || strcasecmp (lang, "C") == 0)
     ret->match = lang_vers_match_lang_c;
diff --git a/ld/ldmain.c b/ld/ldmain.c
index b50ef43..84baa4d 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -240,6 +240,7 @@ main (argc, argv)
   link_info.no_undefined = false;
   link_info.allow_shlib_undefined = false;
   link_info.allow_multiple_definition = false;
+  link_info.allow_undefined_version = true;
   link_info.strip = strip_none;
   link_info.discard = discard_sec_merge;
   link_info.keep_memory = true;
diff --git a/ld/lexsup.c b/ld/lexsup.c
index ddaf692..4acb4fd 100644
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -127,7 +127,8 @@ int parsing_defsym = 0;
 #define OPTION_TARGET_HELP              (OPTION_UNIQUE + 1)
 #define OPTION_ALLOW_SHLIB_UNDEFINED	(OPTION_TARGET_HELP + 1)
 #define OPTION_ALLOW_MULTIPLE_DEFINITION (OPTION_ALLOW_SHLIB_UNDEFINED + 1)
-#define OPTION_DISCARD_NONE		(OPTION_ALLOW_MULTIPLE_DEFINITION + 1)
+#define OPTION_NO_UNDEFINED_VERSION	(OPTION_ALLOW_MULTIPLE_DEFINITION + 1)
+#define OPTION_DISCARD_NONE		(OPTION_NO_UNDEFINED_VERSION + 1)
 #define OPTION_SPARE_DYNAMIC_TAGS	(OPTION_DISCARD_NONE + 1)
 #define OPTION_NO_DEFINE_COMMON		(OPTION_SPARE_DYNAMIC_TAGS + 1)
 #define OPTION_NOSTDLIB			(OPTION_NO_DEFINE_COMMON + 1)
@@ -322,6 +323,8 @@ static const struct ld_option ld_options[] =
      '\0', NULL, N_("Allow undefined symbols in shared objects"), TWO_DASHES },
   { {"allow-multiple-definition", no_argument, NULL, OPTION_ALLOW_MULTIPLE_DEFINITION},
      '\0', NULL, N_("Allow multiple definitions"), TWO_DASHES },
+  { {"no-undefined-version", no_argument, NULL, OPTION_NO_UNDEFINED_VERSION},
+     '\0', NULL, N_("Disallow undefined version"), 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},
@@ -767,6 +770,9 @@ parse_args (argc, argv)
 	case OPTION_ALLOW_MULTIPLE_DEFINITION:
 	  link_info.allow_multiple_definition = true;
 	  break;
+	case OPTION_NO_UNDEFINED_VERSION:
+	  link_info.allow_undefined_version = false;
+	  break;
 	case OPTION_NO_WARN_MISMATCH:
 	  command_line.warn_mismatch = false;
 	  break;
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index b492850..0c2e3b9 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-07  H.J. Lu <hjl@gnu.org>
+
+	* ld-elfvers/vers.exp: Add --no-undefined-version.
+
+	* ld-elfvers/vers1.map: Remove the unused foo1 and foo2.
+	* ld-elfvers/vers8.map: Likewise.
+	* ld-elfvers/vers18.map: Likewise.
+
 2002-07-30  John David Anglin  <dave@hiauly1.hia.nrc.ca>
 
 	* ld-discard/discard.exp, ld-scripts/phdrs.exp, ld-scripts/phdrs2.exp,
diff --git a/ld/testsuite/ld-elfvers/vers.exp b/ld/testsuite/ld-elfvers/vers.exp
index 1acc0e6..7380729 100644
--- a/ld/testsuite/ld-elfvers/vers.exp
+++ b/ld/testsuite/ld-elfvers/vers.exp
@@ -62,7 +62,7 @@ set tmpdir tmpdir
 set VOBJDUMP_FLAGS --private-headers
 set DOBJDUMP_FLAGS --dynamic-syms
 set SOBJDUMP_FLAGS --syms
-set shared --shared
+set shared "--shared --no-undefined-version"
 set script --version-script
 
 proc test_ar { test lib object expect } {
@@ -643,7 +643,7 @@ proc build_exec { test source execname flags solibname verexp versymexp symexp }
     global CC
     global CFLAGS
 
-    set shared --shared
+    set shared "--shared --no-undefined-version"
     set script --version-script
     if ![ld_compile "$CC -S $CFLAGS" $srcdir/$subdir/$source $tmpdir/$execname.s]     {
 	unresolved "$test"
diff --git a/ld/testsuite/ld-elfvers/vers1.map b/ld/testsuite/ld-elfvers/vers1.map
index 8fc37bc..767915c 100644
--- a/ld/testsuite/ld-elfvers/vers1.map
+++ b/ld/testsuite/ld-elfvers/vers1.map
@@ -1,6 +1,4 @@
 VERS_1.1 {
-	 global:
-		 foo1;
 	 local:
 		 hide_old*; 
 		 hide_original*; 
@@ -8,7 +6,6 @@ VERS_1.1 {
 };
 
 VERS_1.2 {
-		 foo2;
 } VERS_1.1;
 
 VERS_2.0 {
diff --git a/ld/testsuite/ld-elfvers/vers18.map b/ld/testsuite/ld-elfvers/vers18.map
index eac2b0e..8dcff39 100644
--- a/ld/testsuite/ld-elfvers/vers18.map
+++ b/ld/testsuite/ld-elfvers/vers18.map
@@ -1,6 +1,4 @@
 VERS_1.1 {
-	 global:
-		 foo1;
 	 local:
 		 hide_old*; 
 		 hide_original*; 
@@ -8,7 +6,6 @@ VERS_1.1 {
 };
 
 VERS_1.2 {
-		 foo2;
 } VERS_1.1;
 
 VERS_2.0 {
diff --git a/ld/testsuite/ld-elfvers/vers8.map b/ld/testsuite/ld-elfvers/vers8.map
index 2635955..c24fb10 100644
--- a/ld/testsuite/ld-elfvers/vers8.map
+++ b/ld/testsuite/ld-elfvers/vers8.map
@@ -1,7 +1,5 @@
 VERSION {
 	VERS_1.1 {
-		 global:
-			 foo1;
 		 local:
 			 hide_old*; 
 			 hide_original*; 
@@ -9,7 +7,6 @@ VERSION {
 	};
 	
 	VERS_1.2 {
-			 foo2;
 	} VERS_1.1;
 	
 	VERS_2.0 {