Mercurial > hg > graal-compiler
changeset 594:7898caac2071
Merge
author | apangin |
---|---|
date | Thu, 26 Feb 2009 14:25:55 -0800 |
parents | 1b68c738c0d9 (diff) ef3b3df478b9 (current diff) |
children | 1fa16c3565be |
files | src/cpu/x86/vm/vm_version_x86_32.cpp src/cpu/x86/vm/vm_version_x86_32.hpp src/cpu/x86/vm/vm_version_x86_64.cpp src/cpu/x86/vm/vm_version_x86_64.hpp |
diffstat | 2 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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);