# HG changeset patch
# User jcoomes
# Date 1234216046 28800
# Node ID 01ddca3f0730163304a5b70019187e0bc54bdf86
# Parent  dc3ad84615cfd79c715b6d582bd476fbc4dbe57f# Parent  69c752d998415145b20b87f51a3c3428ae715937
Merge

diff -r dc3ad84615cf -r 01ddca3f0730 .hgtags
--- a/.hgtags	Mon Jan 26 12:07:54 2009 -0800
+++ b/.hgtags	Mon Feb 09 13:47:26 2009 -0800
@@ -17,3 +17,4 @@
 81a0cbe3b28460ce836109934ece03db7afaf9cc jdk7-b40
 f9d938ede1960d18cb7cf23c645b026519c1a678 jdk7-b41
 ad8c8ca4ab0f4c86e74c061958f44a8f4a930f2c jdk7-b42
+fc6a5ae3fef5ebacfa896dbb3ae37715e388e282 jdk7-b43
diff -r dc3ad84615cf -r 01ddca3f0730 make/linux/makefiles/gcc.make
--- a/make/linux/makefiles/gcc.make	Mon Jan 26 12:07:54 2009 -0800
+++ b/make/linux/makefiles/gcc.make	Mon Feb 09 13:47:26 2009 -0800
@@ -131,6 +131,14 @@
 # Enable linker optimization
 LFLAGS += -Xlinker -O1
 
+# If this is a --hash-style=gnu system, use --hash-style=both
+#   The gnu .hash section won't work on some Linux systems like SuSE 10.
+_HAS_HASH_STYLE_GNU:=$(shell $(CC) -dumpspecs | grep -- '--hash-style=gnu')
+ifneq ($(_HAS_HASH_STYLE_GNU),)
+  LDFLAGS_HASH_STYLE = -Wl,--hash-style=both
+endif
+LFLAGS += $(LDFLAGS_HASH_STYLE)
+
 # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file.
 MAPFLAG = -Xlinker --version-script=FILENAME