From: "Dmitry V. Levin" <ldv@altlinux.org>

Date: Tue, 14 Jan 2014 01:20:47 +0000

Subject: gold/testsuite: use sysv hash style for two tests

Two tests (strong_ref_weak_def.sh and dyn_weak_ref.sh) parse readelf

output which is noticeably different for sysv and gnu hash style.

diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am

index defaced..defaced 100644

--- a/gold/testsuite/Makefile.am

+++ b/gold/testsuite/Makefile.am

@@ -3029,7 +3029,7 @@ strong_ref_weak_def_1.o: strong_ref_weak_def_1.c

 	$(COMPILE) -o $@ -c -fPIC $<

 strong_ref_weak_def_1.so: strong_ref_weak_def_1.o strong_ref_weak_def_2.so \

 	gcctestdir/ld

-	gcctestdir/ld -shared -o $@ strong_ref_weak_def_1.o \

+	gcctestdir/ld --hash-style=both -shared -o $@ strong_ref_weak_def_1.o \

 		strong_ref_weak_def_2.so

 strong_ref_weak_def.stdout: strong_ref_weak_def_1.so

 	$(TEST_READELF) -sWD $< > $@

@@ -3049,7 +3049,7 @@ dyn_weak_ref_1.o: dyn_weak_ref_1.c

 # We intentionally put dyn_weak_ref_2.so in front of dyn_weak_ref_1.o

 # so that the weak ref there goes to gold's symbol table first.

 dyn_weak_ref_1.so: dyn_weak_ref_1.o dyn_weak_ref_2.so gcctestdir/ld

-	gcctestdir/ld -shared -o $@ dyn_weak_ref_2.so dyn_weak_ref_1.o

+	gcctestdir/ld --hash-style=both -shared -o $@ dyn_weak_ref_2.so dyn_weak_ref_1.o

 dyn_weak_ref.stdout: dyn_weak_ref_1.so

 	$(TEST_READELF) -sWD $< > $@

diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in

index defaced..defaced 100644

--- a/gold/testsuite/Makefile.in

+++ b/gold/testsuite/Makefile.in

@@ -9423,7 +9423,7 @@ uninstall-am:

 @GCC_TRUE@@NATIVE_LINKER_TRUE@	$(COMPILE) -o $@ -c -fPIC $<

 @GCC_TRUE@@NATIVE_LINKER_TRUE@strong_ref_weak_def_1.so: strong_ref_weak_def_1.o strong_ref_weak_def_2.so \

 @GCC_TRUE@@NATIVE_LINKER_TRUE@	gcctestdir/ld

-@GCC_TRUE@@NATIVE_LINKER_TRUE@	gcctestdir/ld -shared -o $@ strong_ref_weak_def_1.o \

+@GCC_TRUE@@NATIVE_LINKER_TRUE@	gcctestdir/ld --hash-style=both -shared -o $@ strong_ref_weak_def_1.o \

 @GCC_TRUE@@NATIVE_LINKER_TRUE@		strong_ref_weak_def_2.so

 @GCC_TRUE@@NATIVE_LINKER_TRUE@strong_ref_weak_def.stdout: strong_ref_weak_def_1.so

 @GCC_TRUE@@NATIVE_LINKER_TRUE@	$(TEST_READELF) -sWD $< > $@

@@ -9436,7 +9436,7 @@ uninstall-am:

 # We intentionally put dyn_weak_ref_2.so in front of dyn_weak_ref_1.o

 # so that the weak ref there goes to gold's symbol table first.

 @GCC_TRUE@@NATIVE_LINKER_TRUE@dyn_weak_ref_1.so: dyn_weak_ref_1.o dyn_weak_ref_2.so gcctestdir/ld

-@GCC_TRUE@@NATIVE_LINKER_TRUE@	gcctestdir/ld -shared -o $@ dyn_weak_ref_2.so dyn_weak_ref_1.o

+@GCC_TRUE@@NATIVE_LINKER_TRUE@	gcctestdir/ld --hash-style=both -shared -o $@ dyn_weak_ref_2.so dyn_weak_ref_1.o

 @GCC_TRUE@@NATIVE_LINKER_TRUE@dyn_weak_ref.stdout: dyn_weak_ref_1.so

 @GCC_TRUE@@NATIVE_LINKER_TRUE@	$(TEST_READELF) -sWD $< > $@

 @GCC_TRUE@@NATIVE_LINKER_TRUE@start_lib_test: start_lib_test_main.o libstart_lib_test.a start_lib_test_2.o start_lib_test_3.o \