19990502 sourceware importbinu_ss_19990502

47 files changed, 1321 insertions, 0 deletions

diff --git a/ld/testsuite/ld-elfvers/vers.exp b/ld/testsuite/ld-elfvers/vers.exp
new file mode 100644
index 0000000..5dfaa93
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers.exp
@@ -0,0 +1,808 @@
+# Expect script for ld-version tests
+#   Copyright (C) 1997, 1998 Free Software Foundation
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# Written by Eric Youngdale (eric@andante.jic.com)
+
+#
+
+# This test can only be run if ld generates native executables.
+if ![isnative] then {return}
+
+# This test can only be run on a couple of ELF platforms.
+# Square bracket expressions seem to confuse istarget.
+# This is similar to the test that is used in ld-shared, BTW.
+if { ![istarget i?86-*-sysv4*] \
+     && ![istarget i?86-*-unixware] \
+     && ![istarget i?86-*-elf*] \
+     && ![istarget i?86-*-linux*] \
+     && ![istarget m68k-*-linux*] \
+     && ![istarget mips*-*-irix5*] \
+     && ![istarget powerpc-*-elf*] \
+     && ![istarget powerpc-*-linux*] \
+     && ![istarget powerpc-*-sysv4*] \
+     && ![istarget sparc*-*-elf] \
+     && ![istarget sparc*-*-solaris2*]
+     && ![istarget alpha*-*-linux*] } {
+    return
+}
+
+if { [istarget i?86-*-linuxaout*] \
+     || [istarget i?86-*-linuxoldld*] \
+     || [istarget m68k-*-linuxaout*] } {
+    return
+}
+
+if { [istarget rs6000*-*-aix*] || [istarget powerpc*-*-aix*] } {
+    return
+}
+
+set diff diff
+set tmpdir tmpdir
+set VOBJDUMP_FLAGS --private-headers
+set DOBJDUMP_FLAGS --dynamic-syms
+set SOBJDUMP_FLAGS --syms
+set shared --shared
+set script --version-script
+
+proc test_ar { test lib object expect } {
+    global ar
+    global nm
+    global tmpdir
+    global srcdir
+    global subdir
+    global diff
+
+    verbose -log "$ar -cr $tmpdir/$lib $tmpdir/$object"
+    catch "exec $ar -cr $tmpdir/$lib $tmpdir/$object" exec_output
+    set exec_output [prune_warnings $exec_output]
+    if ![string match "" $exec_output] {
+	verbose -log "$exec_output"
+	unresolved "$test"
+	return
+    }
+    
+    verbose -log "$nm --print-armap $tmpdir/$lib | grep \" in \" | egrep \"VERS\\|bar\\|foo\" | sort > $tmpdir/nm.out"
+
+    catch "exec $nm --print-armap $tmpdir/$lib | grep \\\ in\\\  | egrep VERS\\\|bar\\\|foo | sort > $tmpdir/nm.out" exec_output
+    if [string match "" $exec_output] then {
+	catch "exec $diff -q $tmpdir/nm.out $srcdir/$subdir/$expect" exec_output
+	set exec_output [prune_warnings $exec_output]
+	if [string match "" $exec_output] then {
+	    pass $test
+	    return
+	} else {
+	    verbose -log "$exec_output"
+	    fail "$test"
+	    return
+	}
+    } else {
+	verbose -log "$exec_output"
+	fail "$test"
+    }
+}
+
+#
+# objdump_emptysymstuff
+#	Check non-dynamic symbols and make sure there are none with '@'.
+#
+proc objdump_emptysymstuff { objdump object } {
+    global SOBJDUMP_FLAGS
+    global version_output
+    global diff
+
+    if ![info exists SOBJDUMP_FLAGS] { set SOBJDUMP_FLAGS "" }
+
+    verbose -log "$objdump $SOBJDUMP_FLAGS $object | sed -n /\@/p"
+
+    catch "exec $objdump $SOBJDUMP_FLAGS $object | sed -n /\@/p" exec_output
+    set exec_output [prune_warnings $exec_output]
+    if [string match "" $exec_output] then {
+# We shouldn't get anything here.
+	return 1
+    } else {
+# it is not normal to come here - we have no output to compare.
+	verbose -log "$exec_output"
+	verbose -log "objdump_emptysymstuff: did not expect any output from objdump"
+	return 0
+    }
+
+}
+
+#
+# objdump_emptydynsymstuff
+#	Check dynamic symbols and make sure there are none with '@'.
+#
+proc objdump_emptydynsymstuff { objdump object } {
+    global DOBJDUMP_FLAGS
+    global version_output
+    global diff
+
+    if ![info exists VOBJDUMP_FLAGS] { set VOBJDUMP_FLAGS "" }
+
+    verbose -log "$objdump $DOBJDUMP_FLAGS $object | sed -n /VERS/p\\\;/show/p"
+
+    catch "exec $objdump $DOBJDUMP_FLAGS $object | sed -n /VERS/p\\\;/show/p" exec_output
+    set exec_output [prune_warnings $exec_output]
+    if [string match "" $exec_output] then {
+# We shouldn't get anything here.
+	return 1
+    } else { if [string match "*objdump: *: not a dynamic object" $exec_output] then {
+	return 1
+    } else {
+# it is not normal to come here - we have no output to compare.
+	verbose -log "$exec_output"
+	verbose -log "objdump_emptydynsymstuff: did not expect any output from objdump"
+	return 0
+    } }
+}
+
+#
+# objdump_emptyverstuff
+#	Make sure there is no version information
+#
+proc objdump_emptyverstuff { objdump object } {
+    global VOBJDUMP_FLAGS
+    global version_output
+    global diff
+    global tmpdir
+
+    if {[which $objdump] == 0} then {
+	perror "$objdump does not exist"
+	return 0
+    }
+
+    if ![info exists VOBJDUMP_FLAGS] { set VOBJDUMP_FLAGS "" }
+
+    verbose -log "$objdump $VOBJDUMP_FLAGS $object | sed -n /Version/,\\\$p > $tmpdir/objdump.out"
+
+    catch "exec $objdump $VOBJDUMP_FLAGS $object | sed -n /Version/,\\\$p" exec_output
+    set exec_output [prune_warnings $exec_output]
+    if [string match "" $exec_output] then {
+# it is normal to fail here - we have no output to compare.
+	return 1
+    } else { if { [string match "*libc*" $exec_output] } then {
+# this probably means that there is version information in libc, so we
+# can't really perform this test.
+	return 1
+    } else {
+	verbose -log "$exec_output"
+	verbose -log "objdump_emptyverstuff: did not expect any output from objdump"
+	return 0
+    } }
+
+}
+
+#
+# objdump_symstuff
+#	Dump non-dynamic symbol stuff and make sure that it is sane.
+#
+proc objdump_symstuff { objdump object expectfile } {
+    global SOBJDUMP_FLAGS
+    global version_output
+    global diff
+    global tmpdir
+
+    if ![info exists SOBJDUMP_FLAGS] { set SOBJDUMP_FLAGS "" }
+
+    verbose -log "$objdump $SOBJDUMP_FLAGS $object | grep \@ | sort  > $tmpdir/objdump.out"
+
+    catch "exec $objdump $SOBJDUMP_FLAGS $object | grep \@ | sort  > $tmpdir/objdump.out" exec_output
+    set exec_output [prune_warnings $exec_output]
+    if [string match "" $exec_output] then {
+
+# Now do a line-by-line comparison to effectively diff the darned things
+# The stuff coming from the expectfile is actually a regex, so we can
+# skip over the actual addresses and so forth.  This is currently very
+# simpleminded - it expects a one-to-one correspondence in terms of line
+# numbers.
+
+	if [file exists $expectfile] then {
+	    set file_a [open $expectfile r]
+	} else {
+	    perror "$expectfile doesn't exist"
+	    return 0
+	}
+	
+	if [file exists $tmpdir/objdump.out] then {
+	    set file_b [open $tmpdir/objdump.out r]
+	} else {
+	    perror "$tmpdir/objdump.out doesn't exist"
+	    return 0
+	}
+
+	verbose "# Diff'ing: $expectfile $tmpdir/objdump.out" 2
+
+	set eof -1
+	set differences 0
+
+	while { [gets $file_a line] != $eof } {
+	    if [regexp "^#.*$" $line] then {
+		continue
+	    } else {
+		lappend list_a $line
+	    }
+	}
+	close $file_a
+
+	while { [gets $file_b line] != $eof } {
+	    if [regexp "^#.*$" $line] then {
+		continue
+	    } else {
+		lappend list_b $line
+	    }
+	}
+	close $file_b
+	
+	for { set i 0 } { $i < [llength $list_a] } { incr i } {
+	    set line_a [lindex $list_a $i]
+	    set line_b [lindex $list_b $i]
+	    
+
+	    verbose "\t$expectfile: $i: $line_a" 3
+	    verbose "\t/tmp/objdump.out: $i: $line_b" 3
+	    if [regexp $line_a $line_b] then {
+		continue
+	    } else {
+		verbose -log "\t$expectfile: $i: $line_a"
+		verbose -log "\t$tmpdir/objdump.out: $i: $line_b"
+		
+		return 0
+	    }
+	}
+	
+	if { [llength $list_a] != [llength $list_b] } {
+	    verbose -log "Line count"
+	    return 0
+	}
+	
+	if $differences<1 then {
+	    return 1
+	}
+	
+	return 0
+    } else {
+	verbose -log "$exec_output"
+	return 0
+    }
+
+}
+
+#
+# objdump_dymsymstuff
+#	Dump dynamic symbol stuff and make sure that it is sane.
+#
+proc objdump_dynsymstuff { objdump object expectfile } {
+    global DOBJDUMP_FLAGS
+    global version_output
+    global diff
+    global tmpdir
+
+    if ![info exists DOBJDUMP_FLAGS] { set DOBJDUMP_FLAGS "" }
+
+    verbose -log "$objdump $DOBJDUMP_FLAGS $object | sed -n /VERS/p\\\;/show/p | sort | uniq  > $tmpdir/objdump.out"
+
+    catch "exec $objdump $DOBJDUMP_FLAGS $object | sed -n /VERS/p\\\;/show/p | sort | uniq  > $tmpdir/objdump.out" exec_output
+    set exec_output [prune_warnings $exec_output]
+    if [string match "" $exec_output] then {
+
+# Now do a line-by-line comparison to effectively diff the darned things
+# The stuff coming from the expectfile is actually a regex, so we can
+# skip over the actual addresses and so forth.  This is currently very
+# simpleminded - it expects a one-to-one correspondence in terms of line
+# numbers.
+
+	if [file exists $expectfile] then {
+	    set file_a [open $expectfile r]
+	} else {
+	    warning "$expectfile doesn't exist"
+	    return 0
+	}
+	
+	if [file exists $tmpdir/objdump.out] then {
+	    set file_b [open $tmpdir/objdump.out r]
+	} else {
+	    fail "$tmpdir/objdump.out doesn't exist"
+	    return 0
+	}
+
+	verbose "# Diff'ing: $expectfile $tmpdir/objdump.out" 2
+
+	set eof -1
+	set differences 0
+
+	while { [gets $file_a line] != $eof } {
+	    if [regexp "^#.*$" $line] then {
+		continue
+	    } else {
+		lappend list_a $line
+	    }
+	}
+	close $file_a
+
+	while { [gets $file_b line] != $eof } {
+	    if [regexp "^#.*$" $line] then {
+		continue
+	    } else {
+		lappend list_b $line
+	    }
+	}
+	close $file_b
+	
+	for { set i 0 } { $i < [llength $list_b] } { incr i } {
+	    set line_b [lindex $list_b $i]
+	    
+# The tests are rigged so that we should never export a symbol with the
+# word 'hide' in it.  Thus we just search for it, and bail if we find it.
+	    if [regexp "hide" $line_b] then {
+		verbose -log "\t$tmpdir/objdump.out: $i: $line_b"
+		
+		return 0
+	    }
+
+	    verbose "\t$expectfile: $i: $line_b" 3
+
+	    # We can't assume that the sort is consistent across
+	    # systems, so we must check each regexp.  When we find a
+	    # regexp, we null it out, so we don't match it twice.
+	    for { set j 0 } { $j < [llength $list_a] } { incr j } {
+		set line_a [lindex $list_a $j]
+
+		if [regexp $line_a $line_b] then {
+		    lreplace $list_a $j $j "CAN NOT MATCH"
+		    break
+		}
+	    }
+
+	    if { $j >= [llength $list_a] } {
+		verbose -log "\t$tmpdir/objdump.out: $i: $line_b"
+		
+		return 0
+	    }
+	}
+	
+	if { [llength $list_a] != [llength $list_b] } {
+	    verbose -log "Line count"
+	    return 0
+	}
+	
+	if $differences<1 then {
+	    return 1
+	}
+	
+	return 0
+    } else {
+	verbose -log "$exec_output"
+	return 0
+    }
+
+}
+
+#
+# objdump_versionstuff
+#	Dump version definitions/references and make sure that it is sane.
+#
+proc objdump_versionstuff { objdump object expectfile } {
+    global VOBJDUMP_FLAGS
+    global version_output
+    global diff
+    global tmpdir
+
+    if {[which $objdump] == 0} then {
+	perror "$objdump does not exist"
+	return 0
+    }
+
+    if ![info exists VOBJDUMP_FLAGS] { set VOBJDUMP_FLAGS "" }
+
+    verbose -log "$objdump $VOBJDUMP_FLAGS $object | sed -n /Version/,\\\$p > $tmpdir/objdump.out"
+
+    catch "exec $objdump $VOBJDUMP_FLAGS $object | sed -n /Version/,\\\$p > $tmpdir/objdump.out" exec_output
+    set exec_output [prune_warnings $exec_output]
+    if [string match "" $exec_output] then {
+
+	# It's OK if there are extra lines in the actual output; they
+	# may come from version information in libc.  We require that
+	# every line in EXPECTFILE appear in the output in order.
+
+	set f1 [open $tmpdir/objdump.out r]
+	set f2 [open $expectfile r]
+	gets $f2 l2
+	while { [gets $f1 l1] != -1 } {
+	    if { [string match $l2 $l1] } then {
+		if { [gets $f2 l2] == -1 } then {
+		    close $f1
+		    close $f2
+		    return 1
+		}
+	    }
+	}
+
+	# We reached the end of the output without seeing the line we
+	# expected.  This is a test failure.
+
+	close $f1
+	close $f2
+
+	verbose -log "Did not find \"$l2\""
+	set f1 [open $tmpdir/objdump.out r]
+	while { [gets $f1 l1] != -1 } {
+	    verbose -log $l1
+	}
+
+	verbose -log "$exec_output"
+	return 0
+    } else {
+	verbose -log "$exec_output"
+	return 0
+    }
+}
+
+proc build_vers_lib { test source libname other mapfile verexp versymexp symexp } {
+    global ld
+    global srcdir
+    global subdir
+    global exec_output
+    global host_triplet
+    global tmpdir
+    global as
+    global objdump
+    global CC
+    global CFLAGS
+    global shared
+    global script
+
+    if ![ld_compile "$CC -S $CFLAGS" $srcdir/$subdir/$source $tmpdir/$libname.s]     {
+	unresolved "$test"
+	return
+    }
+
+    if ![ld_assemble $as $tmpdir/$libname.s $tmpdir/$libname.o ]     {
+	unresolved "$test"
+	return
+    }
+
+    if [string match "" $other] then {
+	set other_lib ""
+    } else {
+	set other_lib $tmpdir/$other
+    }
+
+    if [string match "" $mapfile] then {
+	set script_arg ""
+    } else {
+	set script_arg "$script $srcdir/$subdir/$mapfile"
+    }
+
+    if {![ld_simple_link $ld $tmpdir/$libname.so "$shared $tmpdir/$libname.o $other_lib $script_arg"]}     {
+	fail "$test"
+	return
+    }
+
+    if {![objdump_versionstuff $objdump $tmpdir/$libname.so $srcdir/$subdir/$verexp ]}     {
+	fail "$test"
+	return
+    }
+
+    if {![objdump_dynsymstuff $objdump $tmpdir/$libname.so $srcdir/$subdir/$versymexp ]}     {
+	fail "$test"
+	return
+    }
+
+    if [string match "" $symexp] then {
+	if {![objdump_emptysymstuff $objdump $tmpdir/$libname.o ]}     {
+	    fail "$test"
+	    return
+	}
+    } else {
+	if {![objdump_symstuff $objdump $tmpdir/$libname.o $srcdir/$subdir/$symexp ]}     {
+	    fail "$test"
+	    return
+	}
+    }
+
+    pass $test
+    
+}
+
+proc test_ldfail { test flag source execname other mapfile whyfail } {
+    global ld
+    global srcdir
+    global subdir
+    global exec_output
+    global host_triplet
+    global tmpdir
+    global as
+    global objdump
+    global CC
+    global CFLAGS
+    global script
+
+    if [string match "" $other] then {
+	set other_lib ""
+    } else {
+	set other_lib $tmpdir/$other
+    }
+
+    if ![ld_compile "$CC -S $flag $CFLAGS" $srcdir/$subdir/$source $tmpdir/$execname.s]     {
+	unresolved "$test"
+	return
+    }
+
+    if ![ld_assemble $as $tmpdir/$execname.s $tmpdir/$execname.o ]     {
+	unresolved "$test"
+	return
+    }
+
+    verbose -log "This link should fail because of $whyfail"
+
+    if [string match "" $mapfile] then {
+	set script_arg ""
+    } else {
+	set script_arg "$script $srcdir/$subdir/$mapfile"
+    }
+
+    if {![ld_link $ld $tmpdir/$execname "$tmpdir/$execname.o $other_lib $script_arg"]}     {
+	pass "$test"
+	return
+    }
+    fail "$test"
+}
+
+proc test_asfail { test flag source execname whyfail } {
+    global srcdir
+    global subdir
+    global tmpdir
+    global as
+    global CC
+    global CFLAGS
+
+    if ![ld_compile "$CC -S $flag $CFLAGS" $srcdir/$subdir/$source $tmpdir/$execname.s]     {
+	unresolved "$test"
+	return
+    }
+
+    verbose -log "This assemble should fail because of $whyfail"
+    catch "exec $as -o $tmpdir/$execname.o $tmpdir/$execname.s" exec_output
+    set exec_output [prune_warnings $exec_output]
+    if [string match "" $exec_output] then {
+	fail "$test"
+	return
+    }
+    verbose -log "$exec_output"
+    pass "$test"
+}
+
+proc test_strip_vers_lib { test srclib libname verexp versymexp } {
+    global strip
+    global srcdir
+    global subdir
+    global exec_output
+    global host_triplet
+    global tmpdir
+    global objdump
+
+    verbose -log "cp $tmpdir/$srclib $tmpdir/$libname.so"
+    exec cp $tmpdir/$srclib $tmpdir/$libname.so
+
+    verbose -log "$strip $tmpdir/$libname.so"
+    catch "exec $strip $tmpdir/$libname.so" exec_output
+    if [string match "" $exec_output] then {
+
+# If strip went OK, then run the usual tests on the thing to make sure that
+# it is sane.
+	if {![objdump_versionstuff $objdump $tmpdir/$libname.so $srcdir/$subdir/$verexp ]}     {
+	    fail "$test"
+	    return
+	}
+	
+	if {![objdump_dynsymstuff $objdump $tmpdir/$libname.so $srcdir/$subdir/$versymexp ]}     {
+	    fail "$test"
+	    return
+	}
+	
+    } else {
+	verbose -log "$exec_output"
+	fail "$test"
+	return
+    }
+    pass $test
+}
+
+
+proc build_exec { test source execname flags solibname verexp versymexp symexp } {
+    global ld
+    global srcdir
+    global subdir
+    global exec_output
+    global host_triplet
+    global tmpdir
+    global as
+    global objdump
+    global CC
+    global CFLAGS
+
+    set shared --shared
+    set script --version-script
+    if ![ld_compile "$CC -S $CFLAGS" $srcdir/$subdir/$source $tmpdir/$execname.s]     {
+	unresolved "$test"
+	return
+    }
+
+    if ![ld_assemble $as $tmpdir/$execname.s $tmpdir/$execname.o ]     {
+	unresolved "$test"
+	return
+    }
+
+    if [string match "" $solibname] then {
+	set solibname_lib ""
+    } else {
+	set solibname_lib $tmpdir/$solibname
+    }
+
+    if {![ld_link $ld $tmpdir/$execname "$flags $tmpdir/$execname.o $solibname_lib"]}     {
+	fail "$test"
+	return
+    }
+
+    if [string match "" $verexp] then {
+#
+# Make sure we get nothing back.
+#
+	if {![objdump_emptyverstuff $objdump $tmpdir/$execname ]}     {
+	    fail "$test"
+	    return
+	}
+    } else {
+	if {![objdump_versionstuff $objdump $tmpdir/$execname $srcdir/$subdir/$verexp ]}     {
+	    fail "$test"
+	    return
+	}
+    }
+
+    if [string match "" $versymexp] then {
+	if {![objdump_emptydynsymstuff $objdump $tmpdir/$execname ]}     {
+	    fail "$test"
+	    return
+	}
+    } else {
+	if {![objdump_dynsymstuff $objdump $tmpdir/$execname $srcdir/$subdir/$versymexp ]}     {
+	    fail "$test"
+	    return
+	}
+    }
+
+    if [string match "" $symexp] then {
+	if {![objdump_emptysymstuff $objdump $tmpdir/$execname.o ]}     {
+	    fail "$test"
+	    return
+	}
+    } else {
+	if {![objdump_symstuff $objdump $tmpdir/$execname.o $srcdir/$subdir/$symexp ]}     {
+	    fail "$test"
+	    return
+	}
+    }
+
+    pass $test
+}
+
+
+#
+# Basic test - build a library with versioned symbols.
+#
+build_vers_lib "vers1" vers1.c vers1 "" vers1.map vers1.ver vers1.dsym vers1.sym
+
+
+#
+# Test #2 - build a library, and link it against the library we built in step
+# 1.
+#
+build_vers_lib "vers2" vers2.c vers2 vers1.so vers2.map vers2.ver vers2.dsym ""
+
+#
+# Test #3 - build an executable, and link it against vers1.so.
+#
+build_exec "vers3" vers3.c vers3 "" vers1.so vers3.ver vers3.dsym ""
+
+#
+# Test #4 - Make sure a version implicitly defined in an executable
+# causes a version node to be created.  Verify this both with and without
+# --export-dynamic.
+#
+
+# This test fails on MIPS.  On the MIPS we must put foo in the dynamic
+# symbol table, which the test does not expect.
+setup_xfail "mips*-*-*"
+build_exec "vers4" vers4.c vers4 "" "" "" "" vers4.sym
+
+build_exec "vers4a" vers4.c vers4a "-export-dynamic" "" vers4a.ver vers4a.dsym vers4a.sym
+
+
+#
+# Try multiple definitions foo@BAR and foo@@BAR and make sure the linker
+# complains.
+#
+test_ldfail "vers5" "" vers5.c vers5 "" "" "multiple definition of foo@VERS_1.2"
+
+#
+#
+# Now build a test that should reference a bunch of versioned symbols.
+# All of them should be correctly referenced.
+#
+build_exec "vers6" vers6.c vers6 "" vers1.so vers6.ver vers6.dsym vers6.sym
+
+#
+# Another test to verify that something made local via 'local' is truly not
+# accessible.
+#
+build_vers_lib "vers7a" vers7a.c vers7a "" vers7.map vers7a.ver vers7a.dsym vers7a.sym
+
+test_ldfail "vers7" "" vers7.c vers7 vers7a.so "" "undefined reference to hide_a"
+
+
+#
+# This test is designed to verify that we can pass a linker script on the
+# command line as if it were a normal .o file.
+#
+catch "exec cp $srcdir/$subdir/vers8.map $tmpdir/" ignore_output
+build_vers_lib "vers8" vers1.c vers8 vers8.map "" vers8.ver vers1.dsym vers1.sym
+
+#
+# This test tries to make sure that version references to versioned symbols
+# don't collide with default definitions with the same symbol.
+#
+build_exec "vers9" vers9.c vers9 "-export-dynamic" "" vers9.ver vers9.dsym vers9.sym
+
+
+#
+# Try and use a non-existant version node.  The linker should fail with
+# an error message.
+#
+test_ldfail "vers10" "-DDO_TEST10" vers1.c vers10 "" "vers1.map --shared" "invalid version"
+
+#
+# Try and some things the assembler should complain about.
+#
+test_asfail "vers11" "-DDO_TEST11" vers1.c vers11 "no @ in symver"
+
+test_asfail "vers12" "-DDO_TEST12" vers1.c vers12 "extern version definition"
+
+#
+# Put a shared library in an archive library, and make sure the global
+# archive symbol table is sane.
+#
+test_ar "ar with versioned solib" vers13.a vers1.so vers13.asym
+
+#
+# Strip a shared library, and make sure we didn't screw something up in there.
+#
+test_strip_vers_lib "vers14" vers1.so vers14 vers1.ver vers1.dsym 
+
+
+#
+# Build another test with some versioned symbols.  Here we are going to 
+# try and override something from the library, and we shouldn't get
+# any errors.
+#
+build_exec "vers15" vers15.c vers15 "" vers1.so vers15.ver vers15.dsym vers15.sym
+
+#
+# Test that when we override a versioned symbol from the library this
+# symbol appears in the dynamic symbol table of the executable.
+#
+build_vers_lib "vers16a" vers16a.c vers16a "" vers16.map vers16a.ver vers16a.dsym ""
+build_exec "vers16" vers16.c vers16 "" vers16a.so "" vers16.dsym ""
diff --git a/ld/testsuite/ld-elfvers/vers1.c b/ld/testsuite/ld-elfvers/vers1.c
new file mode 100644
index 0000000..1d41fd9
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers1.c
@@ -0,0 +1,98 @@
+/*
+ * Basic test of versioning.  The idea with this is that we define
+ * a bunch of definitions of the same symbol, and we can theoretically
+ * then link applications against varying sets of these.
+ */
+const char * show_bar1 = "asdf";
+const char * show_bar2 = "asdf";
+
+int
+bar()
+{
+	return 3;
+}
+
+/*
+ * The 'hide' prefix is something so that we can automatically search the
+ * symbol table and verify that none of these symbols were actually exported.
+ */
+int
+hide_original_foo()
+{
+	return 1+bar();
+
+}
+
+int
+hide_old_foo()
+{
+	return 10+bar();
+
+}
+
+int
+hide_old_foo1()
+{
+	return 100+bar();
+
+}
+
+int
+hide_new_foo()
+{
+	return 1000+bar();
+
+}
+
+__asm__(".symver hide_original_foo,show_foo@");
+__asm__(".symver hide_old_foo,show_foo@VERS_1.1");
+__asm__(".symver hide_old_foo1,show_foo@VERS_1.2");
+__asm__(".symver hide_new_foo,show_foo@@VERS_2.0");
+
+
+
+#ifdef DO_TEST10
+/* In test 10, we try and define a non-existant version node.  The linker
+ * should catch this and complain. */
+int
+hide_new_bogus_foo()
+{
+	return 1000+bar();
+
+}
+__asm__(".symver hide_new_bogus_foo,show_foo@VERS_2.2");
+#endif
+
+
+
+
+#ifdef DO_TEST11
+/*
+ * This test is designed to catch a couple of syntactic errors.  The assembler
+ * should complain about both of the directives below.
+ */
+int
+xyzzz()
+{
+  new2_foo();
+  bar33();
+}
+
+__asm__(".symver new2_foo,fooVERS_2.0");
+__asm__(".symver bar33,bar@@VERS_2.0");
+#endif
+
+#ifdef DO_TEST12
+/*
+ * This test is designed to catch a couple of syntactic errors.  The assembler
+ * should complain about both of the directives below.
+ */
+int
+xyzzz()
+{
+  new2_foo();
+  bar33();
+}
+
+__asm__(".symver bar33,bar@@VERS_2.0");
+#endif
diff --git a/ld/testsuite/ld-elfvers/vers1.dsym b/ld/testsuite/ld-elfvers/vers1.dsym
new file mode 100644
index 0000000..834434b
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers1.dsym
@@ -0,0 +1,9 @@
+[0]* g    DO \*ABS\*	[0]*  VERS_1.1    VERS_1.1
+[0]* g    DO \*ABS\*	[0]*  VERS_1.2    VERS_1.2
+[0]* g    DO \*ABS\*	[0]*  VERS_2.0    VERS_2.0
+[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]* \(Base\)       (0x[0-9a-f][0-9a-f] )?show_foo
+[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]* \(VERS_1.1\)   (0x[0-9a-f][0-9a-f] )?show_foo
+[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]* \(VERS_1.2\)   (0x[0-9a-f][0-9a-f] )?show_foo
+[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_2.0    (0x[0-9a-f][0-9a-f] )?show_foo
+[0-9a-f]* g    DO (.s?data|\*ABS\*)	[0-9a-f]*  VERS_2.0    show_bar1
+[0-9a-f]* g    DO (.s?data|\*ABS\*)	[0-9a-f]*  VERS_2.0    show_bar2
diff --git a/ld/testsuite/ld-elfvers/vers1.map b/ld/testsuite/ld-elfvers/vers1.map
new file mode 100644
index 0000000..8fc37bc
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers1.map
@@ -0,0 +1,16 @@
+VERS_1.1 {
+	 global:
+		 foo1;
+	 local:
+		 hide_old*; 
+		 hide_original*; 
+		 hide_new*; 
+};
+
+VERS_1.2 {
+		 foo2;
+} VERS_1.1;
+
+VERS_2.0 {
+		 show_bar1; show_bar2;
+} VERS_1.2;
diff --git a/ld/testsuite/ld-elfvers/vers1.sym b/ld/testsuite/ld-elfvers/vers1.sym
new file mode 100644
index 0000000..70ff855
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers1.sym
@@ -0,0 +1,4 @@
+[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_foo@
+[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_foo@VERS_1.1
+[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_foo@VERS_1.2
+[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_foo@@VERS_2.0
diff --git a/ld/testsuite/ld-elfvers/vers1.ver b/ld/testsuite/ld-elfvers/vers1.ver
new file mode 100644
index 0000000..3e7312b
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers1.ver
@@ -0,0 +1,8 @@
+Version definitions:
+1 0x01 0x0a26881f tmpdir/vers1.so
+2 0x00 0x0a7927b1 VERS_1.1
+3 0x00 0x0a7927b2 VERS_1.2
+	VERS_1.1 
+4 0x00 0x0a7922b0 VERS_2.0
+	VERS_1.2 
+
diff --git a/ld/testsuite/ld-elfvers/vers13.asym b/ld/testsuite/ld-elfvers/vers13.asym
new file mode 100644
index 0000000..d446144
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers13.asym
@@ -0,0 +1,10 @@
+VERS_1.1 in vers1.so
+VERS_1.2 in vers1.so
+VERS_2.0 in vers1.so
+bar in vers1.so
+show_bar1 in vers1.so
+show_bar2 in vers1.so
+show_foo@ in vers1.so
+show_foo@@VERS_2.0 in vers1.so
+show_foo@VERS_1.1 in vers1.so
+show_foo@VERS_1.2 in vers1.so
diff --git a/ld/testsuite/ld-elfvers/vers15.c b/ld/testsuite/ld-elfvers/vers15.c
new file mode 100644
index 0000000..d32be3f
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers15.c
@@ -0,0 +1,35 @@
+/*
+ * Testcase to make sure that if we externally reference a versioned symbol
+ * that we always get the right one.
+ */
+
+int
+foo_1()
+{
+  return 1034;
+}
+
+int
+foo_2()
+{
+  return 1343;
+}
+
+int
+foo_3()
+{
+  return 1334;
+}
+
+int
+main()
+{
+  printf("Expect 4,    get %d\n", foo_1());
+  printf("Expect 13,   get %d\n", foo_2());
+  printf("Expect 103,  get %d\n", foo_3());
+  return 0;
+}
+
+__asm__(".symver foo_1,show_foo@");
+__asm__(".symver foo_2,show_foo@VERS_1.1");
+__asm__(".symver foo_3,show_foo@@VERS_1.2");
diff --git a/ld/testsuite/ld-elfvers/vers15.dsym b/ld/testsuite/ld-elfvers/vers15.dsym
new file mode 100644
index 0000000..1f5e15c
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers15.dsym
@@ -0,0 +1,5 @@
+[0]* g    DO \*ABS\*	[0]*  VERS_1.1    VERS_1.1
+[0]* g    DO \*ABS\*	[0]*  VERS_1.2    VERS_1.2
+[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]* \(Base\)       (0x[0-9a-f][0-9a-f] )?show_foo
+[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]* \(VERS_1.1\)   (0x[0-9a-f][0-9a-f] )?show_foo
+[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_1.2    (0x[0-9a-f][0-9a-f] )?show_foo
diff --git a/ld/testsuite/ld-elfvers/vers15.sym b/ld/testsuite/ld-elfvers/vers15.sym
new file mode 100644
index 0000000..87bab62
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers15.sym
@@ -0,0 +1,3 @@
+[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_foo@
+[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_foo@VERS_1.1
+[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_foo@@VERS_1.2
diff --git a/ld/testsuite/ld-elfvers/vers15.ver b/ld/testsuite/ld-elfvers/vers15.ver
new file mode 100644
index 0000000..3d2ec58
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers15.ver
@@ -0,0 +1,5 @@
+Version definitions:
+1 0x01 0x0d8a2605 tmpdir/vers15
+2 0x00 0x0a7927b2 VERS_1.2
+3 0x00 0x0a7927b1 VERS_1.1
+
diff --git a/ld/testsuite/ld-elfvers/vers16.c b/ld/testsuite/ld-elfvers/vers16.c
new file mode 100644
index 0000000..6668bc6
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers16.c
@@ -0,0 +1,10 @@
+int show_bar ()
+{
+  return 0;
+}
+extern int show_foo ();
+
+int main ()
+{
+  return show_foo ();
+}
diff --git a/ld/testsuite/ld-elfvers/vers16.dsym b/ld/testsuite/ld-elfvers/vers16.dsym
new file mode 100644
index 0000000..6c424c3
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers16.dsym
@@ -0,0 +1,2 @@
+[0-9a-f]* g    DF (\.text|\*ABS\*)	[0-9a-f]*(  Base       )? (0x[0-9a-f][0-9a-f] )?show_bar
+[0-9a-f]*      DF \*UND\*	[0-9a-f]*(             )? (0x[0-9a-f][0-9a-f] )?show_foo
diff --git a/ld/testsuite/ld-elfvers/vers16.map b/ld/testsuite/ld-elfvers/vers16.map
new file mode 100644
index 0000000..766332f
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers16.map
@@ -0,0 +1,3 @@
+VERS_1.1 {
+  global: show_bar;
+};
diff --git a/ld/testsuite/ld-elfvers/vers16a.c b/ld/testsuite/ld-elfvers/vers16a.c
new file mode 100644
index 0000000..153b1fd
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers16a.c
@@ -0,0 +1,8 @@
+int show_bar ()
+{
+  return 1;
+}
+int show_foo ()
+{
+  return show_bar ();
+}
diff --git a/ld/testsuite/ld-elfvers/vers16a.dsym b/ld/testsuite/ld-elfvers/vers16a.dsym
new file mode 100644
index 0000000..058df47
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers16a.dsym
@@ -0,0 +1,3 @@
+[0-9a-f]* g    DO (\.text|\*ABS\*)	[0-9a-f]*  VERS_1\.1    VERS_1\.1
+[0-9a-f]* g    DF (\.text|\*ABS\*)	[0-9a-f]*  VERS_1\.1    (0x[0-9a-f][0-9a-f] )?show_bar
+[0-9a-f]* g    DF (\.text|\*ABS\*)	[0-9a-f]*  Base        (0x[0-9a-f][0-9a-f] )?show_foo
diff --git a/ld/testsuite/ld-elfvers/vers16a.ver b/ld/testsuite/ld-elfvers/vers16a.ver
new file mode 100644
index 0000000..bccf1df
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers16a.ver
@@ -0,0 +1,3 @@
+Version definitions:
+1 0x01 0x0601cfbf tmpdir/vers16a.so
+2 0x00 0x0a7927b1 VERS_1.1
diff --git a/ld/testsuite/ld-elfvers/vers2.c b/ld/testsuite/ld-elfvers/vers2.c
new file mode 100644
index 0000000..d6a537e
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers2.c
@@ -0,0 +1,10 @@
+/*
+ * Test function.  This is built into a shared library, and references a
+ * versioned symbol foo that is in test.so.
+ */
+
+void
+show_xyzzy()
+{
+  printf("%d", show_foo());
+}
diff --git a/ld/testsuite/ld-elfvers/vers2.dsym b/ld/testsuite/ld-elfvers/vers2.dsym
new file mode 100644
index 0000000..99985c2
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers2.dsym
@@ -0,0 +1,3 @@
+[0-9a-f]*      DF \*UND\*	[0-9a-f]*  VERS_2.0    (0x[0-9a-f][0-9a-f] )?show_foo
+[0]* g    DO \*ABS\*	[0]*  VERS_XXX_1.1 VERS_XXX_1.1
+[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_XXX_1.1 (0x[0-9a-f][0-9a-f] )?show_xyzzy
diff --git a/ld/testsuite/ld-elfvers/vers2.map b/ld/testsuite/ld-elfvers/vers2.map
new file mode 100644
index 0000000..cd57d7e
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers2.map
@@ -0,0 +1,4 @@
+
+VERS_XXX_1.1 {
+		 show_xyzzy;
+};
diff --git a/ld/testsuite/ld-elfvers/vers2.ver b/ld/testsuite/ld-elfvers/vers2.ver
new file mode 100644
index 0000000..b526343
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers2.ver
@@ -0,0 +1,8 @@
+Version definitions:
+1 0x01 0x0a26181f tmpdir/vers2.so
+2 0x00 0x08785b51 VERS_XXX_1.1
+
+Version References:
+  required from tmpdir/vers1.so:
+    0x0a7922b0 0x00 03 VERS_2.0
+
diff --git a/ld/testsuite/ld-elfvers/vers3.c b/ld/testsuite/ld-elfvers/vers3.c
new file mode 100644
index 0000000..b006d77
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers3.c
@@ -0,0 +1,10 @@
+/*
+ * Main program for test1, test2.
+ */
+
+int
+main()
+{
+  printf("%d\n", show_foo());
+  return 0;
+}
diff --git a/ld/testsuite/ld-elfvers/vers3.dsym b/ld/testsuite/ld-elfvers/vers3.dsym
new file mode 100644
index 0000000..c9c2642
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers3.dsym
@@ -0,0 +1 @@
+[0-9a-f]*      DF \*UND\*	[0-9a-f]*  VERS_2.0    (0x[0-9a-f][0-9a-f] )?show_foo
diff --git a/ld/testsuite/ld-elfvers/vers3.ver b/ld/testsuite/ld-elfvers/vers3.ver
new file mode 100644
index 0000000..aa230ee
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers3.ver
@@ -0,0 +1,4 @@
+Version References:
+  required from tmpdir/vers1.so:
+    0x0a7922b0 0x00 02 VERS_2.0
+
diff --git a/ld/testsuite/ld-elfvers/vers4.c b/ld/testsuite/ld-elfvers/vers4.c
new file mode 100644
index 0000000..15497ca
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers4.c
@@ -0,0 +1,27 @@
+/*
+ * Testcase to make sure that a versioned symbol definition in an
+ * application correctly defines the version node, if and only if
+ * the actual symbol is exported.  This is built both with and without
+ * -export-dynamic.
+ */
+int
+bar()
+{
+	return 3;
+}
+
+int
+new_foo()
+{
+	return 1000+bar();
+
+}
+
+__asm__(".symver new_foo,foo@@VERS_2.0");
+
+int
+main()
+{
+  printf("%d\n", foo());
+  return 0;
+}
diff --git a/ld/testsuite/ld-elfvers/vers4.sym b/ld/testsuite/ld-elfvers/vers4.sym
new file mode 100644
index 0000000..7449446
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers4.sym
@@ -0,0 +1 @@
+[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?foo@@VERS_2.0
diff --git a/ld/testsuite/ld-elfvers/vers4a.dsym b/ld/testsuite/ld-elfvers/vers4a.dsym
new file mode 100644
index 0000000..f7f9fda
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers4a.dsym
@@ -0,0 +1,2 @@
+[0]* g    DO \*ABS\*	[0]*  VERS_2.0    VERS_2.0
+[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_2.0    (0x[0-9a-f][0-9a-f] )?foo
diff --git a/ld/testsuite/ld-elfvers/vers4a.sym b/ld/testsuite/ld-elfvers/vers4a.sym
new file mode 100644
index 0000000..7449446
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers4a.sym
@@ -0,0 +1 @@
+[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?foo@@VERS_2.0
diff --git a/ld/testsuite/ld-elfvers/vers4a.ver b/ld/testsuite/ld-elfvers/vers4a.ver
new file mode 100644
index 0000000..876cedc
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers4a.ver
@@ -0,0 +1,4 @@
+Version definitions:
+1 0x01 0x0d8a26e1 tmpdir/vers4a
+2 0x00 0x0a7922b0 VERS_2.0
+
diff --git a/ld/testsuite/ld-elfvers/vers5.c b/ld/testsuite/ld-elfvers/vers5.c
new file mode 100644
index 0000000..cc6ea40
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers5.c
@@ -0,0 +1,51 @@
+/*
+ * Testcase to verify that foo@BAR and foo@@BAR are correctly detected
+ * as a multiply defined symbol.
+ */
+const char * bar1 = "asdf";
+const char * bar2 = "asdf";
+
+int
+bar()
+{
+	return 3;
+}
+
+int
+original_foo()
+{
+	return 1+bar();
+
+}
+
+int
+old_foo()
+{
+	return 10+bar();
+
+}
+
+int
+old_foo1()
+{
+	return 100+bar();
+
+}
+
+int
+new_foo()
+{
+	return 1000+bar();
+
+}
+
+__asm__(".symver original_foo,foo@");
+__asm__(".symver old_foo,foo@VERS_1.1");
+__asm__(".symver old_foo1,foo@VERS_1.2");
+__asm__(".symver new_foo,foo@@VERS_1.2");
+
+int
+main ()
+{
+  return 0;
+}
diff --git a/ld/testsuite/ld-elfvers/vers6.c b/ld/testsuite/ld-elfvers/vers6.c
new file mode 100644
index 0000000..b5868bf
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers6.c
@@ -0,0 +1,19 @@
+/*
+ * Testcase to make sure that if we externally reference a versioned symbol
+ * that we always get the right one.
+ */
+
+int
+main()
+{
+  printf("Expect 4,    get %d\n", foo_1());
+  printf("Expect 13,   get %d\n", foo_2());
+  printf("Expect 103,  get %d\n", foo_3());
+  printf("Expect 1003, get %d\n", foo_4());
+  return 0;
+}
+
+__asm__(".symver foo_1,show_foo@");
+__asm__(".symver foo_2,show_foo@VERS_1.1");
+__asm__(".symver foo_3,show_foo@VERS_1.2");
+__asm__(".symver foo_4,show_foo@VERS_2.0");
diff --git a/ld/testsuite/ld-elfvers/vers6.dsym b/ld/testsuite/ld-elfvers/vers6.dsym
new file mode 100644
index 0000000..7e851d4
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers6.dsym
@@ -0,0 +1,4 @@
+[0-9a-f]*      DF \*UND\*	[0-9a-f]*              (0x[0-9a-f][0-9a-f] )?show_foo
+[0-9a-f]*      DF \*UND\*	[0-9a-f]*  VERS_2.0    (0x[0-9a-f][0-9a-f] )?show_foo
+[0-9a-f]*      DF \*UND\*	[0-9a-f]*  VERS_1.2    (0x[0-9a-f][0-9a-f] )?show_foo
+[0-9a-f]*      DF \*UND\*	[0-9a-f]*  VERS_1.1    (0x[0-9a-f][0-9a-f] )?show_foo
diff --git a/ld/testsuite/ld-elfvers/vers6.sym b/ld/testsuite/ld-elfvers/vers6.sym
new file mode 100644
index 0000000..d7b5cc7
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers6.sym
@@ -0,0 +1,4 @@
+[0]* *F? *\*UND\*	[0]* show_foo@
+[0]* *F? *\*UND\*	[0]* show_foo@VERS_1.1
+[0]* *F? *\*UND\*	[0]* show_foo@VERS_1.2
+[0]* *F? *\*UND\*	[0]* show_foo@VERS_2.0
diff --git a/ld/testsuite/ld-elfvers/vers6.ver b/ld/testsuite/ld-elfvers/vers6.ver
new file mode 100644
index 0000000..48a2b46
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers6.ver
@@ -0,0 +1,6 @@
+Version References:
+  required from tmpdir/vers1.so:
+    0x0a7927b1 0x00 ?? VERS_1.1
+    0x0a7927b2 0x00 ?? VERS_1.2
+    0x0a7922b0 0x00 ?? VERS_2.0
+
diff --git a/ld/testsuite/ld-elfvers/vers7.c b/ld/testsuite/ld-elfvers/vers7.c
new file mode 100644
index 0000000..d25b7e0
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers7.c
@@ -0,0 +1,11 @@
+/*
+ * Test program that goes with test7.so
+ */
+
+
+int
+main()
+{
+  return hide_a(1) + show_b(1);
+  return 0;
+}
diff --git a/ld/testsuite/ld-elfvers/vers7.map b/ld/testsuite/ld-elfvers/vers7.map
new file mode 100644
index 0000000..65fd501
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers7.map
@@ -0,0 +1,6 @@
+VERS_1 {
+	global:
+		show_b ;
+	local:
+		hide_a;
+};
diff --git a/ld/testsuite/ld-elfvers/vers7a.c b/ld/testsuite/ld-elfvers/vers7a.c
new file mode 100644
index 0000000..7bee8c7
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers7a.c
@@ -0,0 +1,18 @@
+/*
+ * Test supplied by Ulrich.  Verify that we can correctly force 'a'
+ * to local scope.
+ */
+int
+__a_internal (int e)
+{
+  return e + 10;
+}
+
+int
+__b_internal (int e)
+{
+  return e + 42;
+}
+
+asm (".symver __a_internal,hide_a@@VERS_1");
+asm (".symver __b_internal,show_b@@VERS_1");
diff --git a/ld/testsuite/ld-elfvers/vers7a.dsym b/ld/testsuite/ld-elfvers/vers7a.dsym
new file mode 100644
index 0000000..06696c7
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers7a.dsym
@@ -0,0 +1,2 @@
+[0]* g    DO \*ABS\*	[0]*  VERS_1      VERS_1
+[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_1      (0x[0-9a-f][0-9a-f] )?show_b
diff --git a/ld/testsuite/ld-elfvers/vers7a.sym b/ld/testsuite/ld-elfvers/vers7a.sym
new file mode 100644
index 0000000..b99bd61
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers7a.sym
@@ -0,0 +1,2 @@
+[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?hide_a@@VERS_1
+[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_b@@VERS_1
diff --git a/ld/testsuite/ld-elfvers/vers7a.ver b/ld/testsuite/ld-elfvers/vers7a.ver
new file mode 100644
index 0000000..37ef8a8
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers7a.ver
@@ -0,0 +1,4 @@
+Version definitions:
+1 0x01 0x0269fd3f tmpdir/vers7a.so
+2 0x00 0x05aa7921 VERS_1
+
diff --git a/ld/testsuite/ld-elfvers/vers8.c b/ld/testsuite/ld-elfvers/vers8.c
new file mode 100644
index 0000000..a14586c
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers8.c
@@ -0,0 +1,5 @@
+int
+main()
+{
+  return a(1) + b(1);
+}
diff --git a/ld/testsuite/ld-elfvers/vers8.map b/ld/testsuite/ld-elfvers/vers8.map
new file mode 100644
index 0000000..2635955
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers8.map
@@ -0,0 +1,18 @@
+VERSION {
+	VERS_1.1 {
+		 global:
+			 foo1;
+		 local:
+			 hide_old*; 
+			 hide_original*; 
+			 hide_new*; 
+	};
+	
+	VERS_1.2 {
+			 foo2;
+	} VERS_1.1;
+	
+	VERS_2.0 {
+			 show_bar1; show_bar2;
+	} VERS_1.2;
+}
diff --git a/ld/testsuite/ld-elfvers/vers8.ver b/ld/testsuite/ld-elfvers/vers8.ver
new file mode 100644
index 0000000..ef59023
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers8.ver
@@ -0,0 +1,8 @@
+Version definitions:
+1 0x01 0x0a26f81f tmpdir/vers8.so
+2 0x00 0x0a7927b1 VERS_1.1
+3 0x00 0x0a7927b2 VERS_1.2
+	VERS_1.1 
+4 0x00 0x0a7922b0 VERS_2.0
+	VERS_1.2 
+
diff --git a/ld/testsuite/ld-elfvers/vers9.c b/ld/testsuite/ld-elfvers/vers9.c
new file mode 100644
index 0000000..432fddb
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers9.c
@@ -0,0 +1,45 @@
+/*
+ * Testcase to verify that reference to foo@BAR and a definition of foo@@BAR
+ * are not treated as a multiple def.
+ */
+const char * bar1 = "asdf";
+const char * bar2 = "asdf";
+
+int
+bar()
+{
+	return 3;
+}
+
+int
+original_foo()
+{
+	return 1+bar();
+
+}
+
+int
+old_foo()
+{
+	return 10+bar();
+
+}
+
+int
+new_foo()
+{
+	return 1000+bar();
+
+}
+
+int
+main()
+{
+  old_foo1();
+  return 0;
+}
+
+__asm__(".symver original_foo,foo@");
+__asm__(".symver old_foo,foo@VERS_1.1");
+__asm__(".symver old_foo1,foo@VERS_1.2");
+__asm__(".symver new_foo,foo@@VERS_1.2");
diff --git a/ld/testsuite/ld-elfvers/vers9.dsym b/ld/testsuite/ld-elfvers/vers9.dsym
new file mode 100644
index 0000000..9793002
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers9.dsym
@@ -0,0 +1,4 @@
+[0]* g    DO \*ABS\*	[0]*  VERS_1.1    VERS_1.1
+[0]* g    DO \*ABS\*	[0]*  VERS_1.2    VERS_1.2
+[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]* \(VERS_1.1\)   (0x[0-9a-f][0-9a-f] )?foo
+[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_1.2    (0x[0-9a-f][0-9a-f] )?foo
diff --git a/ld/testsuite/ld-elfvers/vers9.sym b/ld/testsuite/ld-elfvers/vers9.sym
new file mode 100644
index 0000000..8231516
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers9.sym
@@ -0,0 +1,4 @@
+[0]* *F? *\*UND\*	[0]* foo@VERS_1.2
+[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?foo@
+[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?foo@VERS_1.1
+[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?foo@@VERS_1.2
diff --git a/ld/testsuite/ld-elfvers/vers9.ver b/ld/testsuite/ld-elfvers/vers9.ver
new file mode 100644
index 0000000..673ba72
--- /dev/null
+++ b/ld/testsuite/ld-elfvers/vers9.ver
@@ -0,0 +1,5 @@
+Version definitions:
+1 0x01 0x04d8a269 tmpdir/vers9
+2 0x00 0x0a7927b1 VERS_1.1
+3 0x00 0x0a7927b2 VERS_1.2
+