Mon, 09 Feb 2009 13:47:26 -0800
Merge
1.1 --- a/.hgtags Mon Jan 26 12:07:54 2009 -0800 1.2 +++ b/.hgtags Mon Feb 09 13:47:26 2009 -0800 1.3 @@ -17,3 +17,4 @@ 1.4 81a0cbe3b28460ce836109934ece03db7afaf9cc jdk7-b40 1.5 f9d938ede1960d18cb7cf23c645b026519c1a678 jdk7-b41 1.6 ad8c8ca4ab0f4c86e74c061958f44a8f4a930f2c jdk7-b42 1.7 +fc6a5ae3fef5ebacfa896dbb3ae37715e388e282 jdk7-b43
2.1 --- a/make/linux/makefiles/gcc.make Mon Jan 26 12:07:54 2009 -0800 2.2 +++ b/make/linux/makefiles/gcc.make Mon Feb 09 13:47:26 2009 -0800 2.3 @@ -131,6 +131,14 @@ 2.4 # Enable linker optimization 2.5 LFLAGS += -Xlinker -O1 2.6 2.7 +# If this is a --hash-style=gnu system, use --hash-style=both 2.8 +# The gnu .hash section won't work on some Linux systems like SuSE 10. 2.9 +_HAS_HASH_STYLE_GNU:=$(shell $(CC) -dumpspecs | grep -- '--hash-style=gnu') 2.10 +ifneq ($(_HAS_HASH_STYLE_GNU),) 2.11 + LDFLAGS_HASH_STYLE = -Wl,--hash-style=both 2.12 +endif 2.13 +LFLAGS += $(LDFLAGS_HASH_STYLE) 2.14 + 2.15 # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file. 2.16 MAPFLAG = -Xlinker --version-script=FILENAME 2.17