# HG changeset patch
# User apangin
# Date 1235687155 28800
# Node ID 7898caac2071a844fd35c5b3f73a65413ccee8a6
# Parent  1b68c738c0d9ef614f51ec8c19d35fd5a95a653a# Parent  ef3b3df478b961647251a6c843842211c95f1c63
Merge

diff -r ef3b3df478b9 -r 7898caac2071 make/linux/makefiles/gcc.make
--- a/make/linux/makefiles/gcc.make	Wed Feb 25 22:55:54 2009 -0800
+++ b/make/linux/makefiles/gcc.make	Thu Feb 26 14:25:55 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
 
diff -r ef3b3df478b9 -r 7898caac2071 src/share/tools/MakeDeps/BuildConfig.java
--- a/src/share/tools/MakeDeps/BuildConfig.java	Wed Feb 25 22:55:54 2009 -0800
+++ b/src/share/tools/MakeDeps/BuildConfig.java	Thu Feb 26 14:25:55 2009 -0800
@@ -247,6 +247,7 @@
         sysDefines.add("HOTSPOT_BUILD_USER="+System.getProperty("user.name"));
         sysDefines.add("HOTSPOT_BUILD_TARGET=\\\""+get("Build")+"\\\"");
         sysDefines.add("_JNI_IMPLEMENTATION_");
+        sysDefines.add("HOTSPOT_LIB_ARCH=\\\"i486\\\"");
 
         sysDefines.addAll(defines);