/hg/icedtea6: PR398: hotspot hs16 / 6b17 build failure on sparc
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Aug 27 15:40:06 PDT 2010
changeset 133ae13dda61 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=133ae13dda61
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Aug 27 23:39:58 2010 +0100
PR398: hotspot hs16 / 6b17 build failure on sparc
2010-08-27 Andrew John Hughes <ahughes at redhat.com>
PR398, S6951319:
* Makefile.am: Add new patch.
* patches/openjdk/6951319-sparc_build_fixes.patch: Backport of
6951319 to fix build issues on GNU/Linux+SPARC.
* patches/systemtap.patch: Rerolled against 6951319.
* NEWS: Updated.
diffstat:
5 files changed, 672 insertions(+), 16 deletions(-)
ChangeLog | 9
Makefile.am | 1
NEWS | 3
patches/openjdk/6951319-sparc_build_fixes.patch | 642 +++++++++++++++++++++++
patches/systemtap.patch | 33 -
diffs (truncated from 796 to 500 lines):
diff -r b1cf18e3cb6c -r 133ae13dda61 ChangeLog
--- a/ChangeLog Fri Aug 27 23:59:00 2010 +0200
+++ b/ChangeLog Fri Aug 27 23:39:58 2010 +0100
@@ -1,3 +1,12 @@ 2010-08-27 Matthias Klose <doko at ubuntu
+2010-08-27 Andrew John Hughes <ahughes at redhat.com>
+
+ PR398, S6951319:
+ * Makefile.am: Add new patch.
+ * patches/openjdk/6951319-sparc_build_fixes.patch:
+ Backport of 6951319 to fix build issues on GNU/Linux+SPARC.
+ * patches/systemtap.patch: Rerolled against 6951319.
+ * NEWS: Updated.
+
2010-08-27 Matthias Klose <doko at ubuntu.com>
* patches/icedtea-too-many-args.diff: Fix build failure with
diff -r b1cf18e3cb6c -r 133ae13dda61 Makefile.am
--- a/Makefile.am Fri Aug 27 23:59:00 2010 +0200
+++ b/Makefile.am Fri Aug 27 23:39:58 2010 +0100
@@ -291,6 +291,7 @@ ICEDTEA_PATCHES = \
patches/openjdk/4356282-opentype.patch \
patches/openjdk/6954424-opentype_javadoc.patch \
patches/openjdk/6438179-systray_check.patch \
+ patches/openjdk/6951319-sparc_build_fixes.patch \
patches/icedtea-too-many-args.diff
if WITH_RHINO
diff -r b1cf18e3cb6c -r 133ae13dda61 NEWS
--- a/NEWS Fri Aug 27 23:59:00 2010 +0200
+++ b/NEWS Fri Aug 27 23:39:58 2010 +0100
@@ -13,7 +13,8 @@ New in release 1.10 (2010-XX-XX):
- S4356282, RH525870: RFE: T2K should be used to rasterize CID/CFF fonts
- S6954424: Support OpenType/CFF fonts in JDK 7
- S6438179: XToolkit.isTraySupported() result has nothing to do with the system tray
-* Netx
+ - S6951319: enable solaris builds using Sun Studio 12 update 1 (fixes PR398)
+* NetX
- RH601281: Possible NullPointerException in splash screen code
New in release 1.9 (2010-XX-XX):
diff -r b1cf18e3cb6c -r 133ae13dda61 patches/openjdk/6951319-sparc_build_fixes.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6951319-sparc_build_fixes.patch Fri Aug 27 23:39:58 2010 +0100
@@ -0,0 +1,642 @@
+# HG changeset patch
+# User jcoomes
+# Date 1282936351 -3600
+# Node ID 379b95785a1faacbe5261b7517159718e139e57b
+# Parent 13f94cc872531ff5b81d1551edf7145f73864c74
+6951319: enable solaris builds using Sun Studio 12 update 1
+Reviewed-by: kamg, ysr, dholmes, johnc
+
+diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/amd64.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/amd64.make Fri Jun 18 01:17:46 2010 -0700
+--- openjdk/hotspot/make/solaris/makefiles/amd64.make Fri Aug 27 20:12:31 2010 +0100
+@@ -33,14 +33,8 @@
+ #
+ ifeq ("${Platform_compiler}", "sparcWorks")
+
+-# Temporary until C++ compiler is fixed
+-
+-# _lwp_create_interpose must have a frame
+-OPT_CFLAGS/os_solaris_x86_64.o = -xO1
+-
+ # Temporary until SS10 C++ compiler is fixed
+ OPT_CFLAGS/generateOptoStub.o = -xO2
+-OPT_CFLAGS/thread.o = -xO2
+
+ else
+
+diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/fastdebug.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/fastdebug.make Fri Jun 18 01:17:46 2010 -0700
+--- openjdk/hotspot/make/solaris/makefiles/fastdebug.make Fri Aug 27 20:12:31 2010 +0100
+@@ -36,15 +36,15 @@
+ ifeq ("${Platform_compiler}", "sparcWorks")
+ OPT_CFLAGS/SLOWER = -xO2
+
+-# Problem with SS12 compiler, dtrace doesn't like the .o files (bug 6693876)
+ ifeq ($(COMPILER_REV_NUMERIC), 509)
+- # To avoid jvm98 crash
+- OPT_CFLAGS/instanceKlass.o = $(OPT_CFLAGS/SLOWER)
+- # Not clear this workaround could be skipped in some cases.
+- OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER)
+- OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER)
+- OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER)
+-endif
++# To avoid jvm98 crash
++OPT_CFLAGS/instanceKlass.o = $(OPT_CFLAGS/SLOWER)
++endif # COMPILER_NUMERIC_REV == 509
++
++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
++# dtrace cannot handle tail call optimization (6672627, 6693876)
++OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT)
++endif # COMPILER_NUMERIC_REV >= 509
+
+ ifeq ($(COMPILER_REV_NUMERIC), 505)
+ # CC 5.5 has bug 4908364 with -xO4 (Fixed in 5.6)
+diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/i486.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/i486.make Fri Jun 18 01:17:46 2010 -0700
+--- openjdk/hotspot/make/solaris/makefiles/i486.make Fri Aug 27 20:12:31 2010 +0100
+@@ -33,25 +33,6 @@
+ # Special case flags for compilers and compiler versions on i486.
+ #
+ ifeq ("${Platform_compiler}", "sparcWorks")
+-
+-# _lwp_create_interpose must have a frame
+-OPT_CFLAGS/os_solaris_x86.o = -xO1
+-else
+-
+-ifeq ("${Platform_compiler}", "gcc")
+-# gcc
+-# _lwp_create_interpose must have a frame
+-OPT_CFLAGS/os_solaris_x86.o = -fno-omit-frame-pointer
+-#
+-else
+-# error
+-_JUNK2_ := $(shell echo >&2 \
+- "*** ERROR: this compiler is not yet supported by this code base!")
+- @exit 1
+-endif
+-endif
+-
+-ifeq ("${Platform_compiler}", "sparcWorks")
+ # ILD is gone as of SS11 (5.8), not supported in SS10 (5.7)
+ ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \< 507), 1)
+ #
+diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/launcher.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/launcher.make Fri Jun 18 01:17:46 2010 -0700
+--- openjdk/hotspot/make/solaris/makefiles/launcher.make Fri Aug 27 20:12:31 2010 +0100
+@@ -80,15 +80,12 @@
+ } > $@
+
+ $(LAUNCHER): $(LAUNCHER.o) $(LIBJVM) $(LAUNCHER_MAPFILE)
++ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),)
++ @echo Linking launcher...
++ $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK)
+ $(QUIETLY) \
+- case "$(CFLAGS_BROWSE)" in \
+- -sbfast|-xsbfast) \
+- ;; \
+- *) \
+- echo Linking launcher...; \
+- $(LINK_LAUNCHER/PRE_HOOK) \
+- $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(LAUNCHER.o) $(LIBS_LAUNCHER); \
+- $(LINK_LAUNCHER/POST_HOOK) \
+- [ -f $(LAUNCHER_G) ] || { ln -s $@ $(LAUNCHER_G); }; \
+- ;; \
+- esac
++ $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(LAUNCHER.o) $(LIBS_LAUNCHER)
++ $(QUIETLY) $(LINK_LAUNCHER/POST_HOOK)
++ [ -f $(LAUNCHER_G) ] || ln -s $@ $(LAUNCHER_G)
++endif # filter -sbfast -xsbfast
++
+diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/optimized.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/optimized.make Fri Jun 18 01:17:46 2010 -0700
+--- openjdk/hotspot/make/solaris/makefiles/optimized.make Fri Aug 27 20:12:31 2010 +0100
+@@ -32,13 +32,10 @@
+ # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files)
+ ifeq ("${Platform_compiler}", "sparcWorks")
+
+-# Problem with SS12 compiler, dtrace doesn't like the .o files (bug 6693876)
+-ifeq ($(COMPILER_REV_NUMERIC),509)
+- # Not clear this workaround could be skipped in some cases.
+- OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER) -g
+- OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER) -g
+- OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER) -g
+-endif
++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
++# dtrace cannot handle tail call optimization (6672627, 6693876)
++OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT)
++endif # COMPILER_NUMERIC_REV >= 509
+
+ # Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12)
+ ifeq ($(COMPILER_REV_NUMERIC),508)
+diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/product.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/product.make Fri Jun 18 01:17:46 2010 -0700
+--- openjdk/hotspot/make/solaris/makefiles/product.make Fri Aug 27 20:12:31 2010 +0100
+@@ -40,13 +40,10 @@
+ # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files)
+ ifeq ("${Platform_compiler}", "sparcWorks")
+
+-# Problem with SS12 compiler, dtrace doesn't like the .o files (bug 6693876)
+-ifeq ($(COMPILER_REV_NUMERIC),509)
+- # Not clear this workaround could be skipped in some cases.
+- OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER) -g
+- OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER) -g
+- OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER) -g
+-endif
++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
++# dtrace cannot handle tail call optimization (6672627, 6693876)
++OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT)
++endif # COMPILER_NUMERIC_REV >= 509
+
+ # Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12)
+ ifeq ($(COMPILER_REV_NUMERIC),508)
+diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/sparcWorks.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/sparcWorks.make Fri Jun 18 01:17:46 2010 -0700
+--- openjdk/hotspot/make/solaris/makefiles/sparcWorks.make Fri Aug 27 20:12:31 2010 +0100
+@@ -48,27 +48,33 @@
+ # Pick which compiler is validated
+ ifeq ($(JRE_RELEASE_VER),1.6.0)
+ # Validated compiler for JDK6 is SS11 (5.8)
+- VALIDATED_COMPILER_REV := 5.8
+- VALIDATED_C_COMPILER_REV := 5.8
++ VALIDATED_COMPILER_REVS := 5.8
++ VALIDATED_C_COMPILER_REVS := 5.8
+ else
+- # Validated compiler for JDK7 is SS12 (5.9)
+- VALIDATED_COMPILER_REV := 5.9
+- VALIDATED_C_COMPILER_REV := 5.9
++ # Validated compilers for JDK7 are SS12 (5.9) or SS12 update 1 (5.10)
++ VALIDATED_COMPILER_REVS := 5.9 5.10
++ VALIDATED_C_COMPILER_REVS := 5.9 5.10
+ endif
+
+-# Warning messages about not using the above validated version
+-ENFORCE_COMPILER_REV${ENFORCE_COMPILER_REV} := ${VALIDATED_COMPILER_REV}
+-ifneq (${COMPILER_REV},${ENFORCE_COMPILER_REV})
+-dummy_target_to_enforce_compiler_rev:=\
+-$(shell echo >&2 WARNING: You are using CC version ${COMPILER_REV} \
+-and should be using version ${ENFORCE_COMPILER_REV}. Set ENFORCE_COMPILER_REV=${COMPILER_REV} to avoid this warning.)
++# Warning messages about not using the above validated versions
++ENFORCE_COMPILER_REV${ENFORCE_COMPILER_REV} := $(strip ${VALIDATED_COMPILER_REVS})
++ifeq ($(filter ${ENFORCE_COMPILER_REV},${COMPILER_REV}),)
++PRINTABLE_CC_REVS := $(subst $(shell echo ' '), or ,${ENFORCE_COMPILER_REV})
++dummy_var_to_enforce_compiler_rev := $(shell \
++ echo >&2 WARNING: You are using CC version ${COMPILER_REV} and \
++ should be using version ${PRINTABLE_CC_REVS}.; \
++ echo >&2 Set ENFORCE_COMPILER_REV=${COMPILER_REV} to avoid this \
++ warning.)
+ endif
+
+-ENFORCE_C_COMPILER_REV${ENFORCE_C_COMPILER_REV} := ${VALIDATED_C_COMPILER_REV}
+-ifneq (${C_COMPILER_REV},${ENFORCE_C_COMPILER_REV})
+-dummy_target_to_enforce_c_compiler_rev:=\
+-$(shell echo >&2 WARNING: You are using cc version ${C_COMPILER_REV} \
+-and should be using version ${ENFORCE_C_COMPILER_REV}. Set ENFORCE_C_COMPILER_REV=${C_COMPILER_REV} to avoid this warning.)
++ENFORCE_C_COMPILER_REV${ENFORCE_C_COMPILER_REV} := $(strip ${VALIDATED_C_COMPILER_REVS})
++ifeq ($(filter ${ENFORCE_C_COMPILER_REV},${C_COMPILER_REV}),)
++PRINTABLE_C_REVS := $(subst $(shell echo ' '), or ,${ENFORCE_C_COMPILER_REV})
++dummy_var_to_enforce_c_compiler_rev := $(shell \
++ echo >&2 WARNING: You are using cc version ${C_COMPILER_REV} and \
++ should be using version ${PRINTABLE_C_REVS}.; \
++ echo >&2 Set ENFORCE_C_COMPILER_REV=${C_COMPILER_REV} to avoid this \
++ warning.)
+ endif
+
+ COMPILER_REV_NUMERIC := $(shell echo $(COMPILER_REV) | awk -F. '{ print $$1 * 100 + $$2 }')
+@@ -139,6 +145,13 @@
+ OPT_CFLAGS/O2=-xO2
+ OPT_CFLAGS/NOOPT=-xO1
+
++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
++ifeq ($(Platform_arch), x86)
++OPT_CFLAGS/NO_TAIL_CALL_OPT = -Wu,-O~yz
++OPT_CCFLAGS/NO_TAIL_CALL_OPT = -Qoption ube -O~yz
++endif # Platform_arch == x86
++endif # COMPILER_REV_NUMERIC >= 509
++
+ #################################################
+ # Begin current (>=5.6) Forte compiler options #
+ #################################################
+@@ -181,10 +194,7 @@
+
+ ifeq ("${Platform_arch_model}", "x86_32")
+
+-OPT_CFLAGS=-xtarget=pentium $(EXTRA_OPT_CFLAGS)
+-
+-# UBE (CC 5.5) has bug 4923569 with -xO4
+-OPT_CFLAGS+=-xO3
++OPT_CFLAGS=-xtarget=pentium -xO4 $(EXTRA_OPT_CFLAGS)
+
+ endif # 32bit x86
+
+@@ -461,7 +471,7 @@
+ # The -g0 setting allows the C++ frontend to inline, which is a big win.
+
+ # Special global options for SS12
+-ifeq ($(COMPILER_REV_NUMERIC),509)
++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
+ # There appears to be multiple issues with the new Dwarf2 debug format, so
+ # we tell the compiler to use the older 'stabs' debug format all the time.
+ # Note that this needs to be used in optimized compiles too to be 100%.
+diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/vm.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/vm.make Fri Jun 18 01:17:46 2010 -0700
+--- openjdk/hotspot/make/solaris/makefiles/vm.make Fri Aug 27 20:12:31 2010 +0100
+@@ -174,19 +174,16 @@
+ endif
+ # making the library:
+ $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE)
+- $(QUIETLY) \
+- case "$(CFLAGS_BROWSE)" in \
+- -sbfast|-xsbfast) \
+- ;; \
+- *) \
+- echo Linking vm...; \
+- $(LINK_LIB.CC/PRE_HOOK) \
+- $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \
+- $(LINK_LIB.CC/POST_HOOK) \
+- rm -f $@.1; ln -s $@ $@.1; \
+- [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
+- ;; \
+- esac
++ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),)
++ @echo Linking vm...
++ $(QUIETLY) $(LINK_LIB.CC/PRE_HOOK)
++ $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM)
++ $(QUIETLY) $(LINK_LIB.CC/POST_HOOK)
++ $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1
++ $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G)
++ $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1
++endif # filter -sbfast -xsbfast
++
+
+ DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
+
+diff -r 13f94cc87253 -r 379b95785a1f src/cpu/sparc/vm/assembler_sparc.hpp
+--- openjdk.orig/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp Fri Jun 18 01:17:46 2010 -0700
+--- openjdk/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp Fri Aug 27 20:12:31 2010 +0100
+@@ -2239,7 +2239,7 @@
+ AddressLiteral constant_oop_address(jobject obj); // find_index
+ inline void set_oop (jobject obj, Register d); // uses allocate_oop_address
+ inline void set_oop_constant (jobject obj, Register d); // uses constant_oop_address
+- inline void set_oop (AddressLiteral& obj_addr, Register d); // same as load_address
++ inline void set_oop (const AddressLiteral& obj_addr, Register d); // same as load_address
+
+ void set_narrow_oop( jobject obj, Register d );
+
+diff -r 13f94cc87253 -r 379b95785a1f src/cpu/sparc/vm/assembler_sparc.inline.hpp
+--- openjdk.orig/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp Fri Jun 18 01:17:46 2010 -0700
+--- openjdk/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp Fri Aug 27 20:12:31 2010 +0100
+@@ -707,7 +707,7 @@
+ }
+
+
+-inline void MacroAssembler::set_oop(AddressLiteral& obj_addr, Register d) {
++inline void MacroAssembler::set_oop(const AddressLiteral& obj_addr, Register d) {
+ assert(obj_addr.rspec().type() == relocInfo::oop_type, "must be an oop reloc");
+ set(obj_addr, d);
+ }
+diff -r 13f94cc87253 -r 379b95785a1f src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp
+--- openjdk.orig/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp Fri Jun 18 01:17:46 2010 -0700
+--- openjdk/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp Fri Aug 27 20:12:31 2010 +0100
+@@ -47,40 +47,56 @@
+ // For Sun Studio - implementation is in solaris_x86_[32/64].il.
+ // For gcc - implementation is just below.
+
+-extern "C" jint _Atomic_add(jint add_value, volatile jint* dest, int mp);
+-extern "C" jint _Atomic_xchg(jint exchange_value, volatile jint* dest);
+-extern "C" jint _Atomic_cmpxchg(jint exchange_value, volatile jint* dest, jint compare_value, int mp);
+-extern "C" jlong _Atomic_cmpxchg_long(jlong exchange_value, volatile jlong* dest, jlong compare_value, int mp);
++// The lock prefix can be omitted for certain instructions on uniprocessors; to
++// facilitate this, os::is_MP() is passed as an additional argument. 64-bit
++// processors are assumed to be multi-threaded and/or multi-core, so the extra
++// argument is unnecessary.
++#ifndef _LP64
++#define IS_MP_DECL() , int is_mp
++#define IS_MP_ARG() , (int) os::is_MP()
++#else
++#define IS_MP_DECL()
++#define IS_MP_ARG()
++#endif // _LP64
++
++extern "C" {
++ jint _Atomic_add(jint add_value, volatile jint* dest IS_MP_DECL());
++ jint _Atomic_xchg(jint exchange_value, volatile jint* dest);
++ jint _Atomic_cmpxchg(jint exchange_value, volatile jint* dest,
++ jint compare_value IS_MP_DECL());
++ jlong _Atomic_cmpxchg_long(jlong exchange_value, volatile jlong* dest,
++ jlong compare_value IS_MP_DECL());
++}
+
+ inline jint Atomic::add (jint add_value, volatile jint* dest) {
+- return _Atomic_add(add_value, dest, (int) os::is_MP());
++ return _Atomic_add(add_value, dest IS_MP_ARG());
++}
++
++inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
++ return _Atomic_xchg(exchange_value, dest);
+ }
+
+ inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value) {
+- return _Atomic_cmpxchg(exchange_value, dest, compare_value, (int) os::is_MP());
++ return _Atomic_cmpxchg(exchange_value, dest, compare_value IS_MP_ARG());
+ }
+
+ inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value) {
+- return _Atomic_cmpxchg_long(exchange_value, dest, compare_value, (int) os::is_MP());
++ return _Atomic_cmpxchg_long(exchange_value, dest, compare_value IS_MP_ARG());
+ }
+
+
+ #ifdef AMD64
+ inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; }
+ inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; }
+-extern "C" jlong _Atomic_add_long(jlong add_value, volatile jlong* dest, int mp);
++extern "C" jlong _Atomic_add_long(jlong add_value, volatile jlong* dest);
+ extern "C" jlong _Atomic_xchg_long(jlong exchange_value, volatile jlong* dest);
+
+ inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+- return (intptr_t)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest, (int) os::is_MP());
++ return (intptr_t)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest);
+ }
+
+ inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+- return (void*)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest, (int) os::is_MP());
+-}
+-
+-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
+- return _Atomic_xchg(exchange_value, dest);
++ return (void*)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest);
+ }
+
+ inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
+@@ -92,11 +108,11 @@
+ }
+
+ inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
+- return (intptr_t)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, (int) os::is_MP());
++ return (intptr_t)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
+ }
+
+ inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value) {
+- return (void*)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, (int) os::is_MP());
++ return (void*)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
+ }
+
+ inline jlong Atomic::load(volatile jlong* src) { return *src; }
+@@ -111,13 +127,6 @@
+ return (void*)add((jint)add_value, (volatile jint*)dest);
+ }
+
+-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
+- // We noticed a CC5.5 bug (4894807), so keep calling the stub just to be safe.
+- // Will use the inline template version after 4894807 is fixed.
+- // return _Atomic_xchg(exchange_value, dest);
+- return (*os::atomic_xchg_func)(exchange_value, dest);
+-}
+-
+ inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
+ return (intptr_t)xchg((jint)exchange_value, (volatile jint*)dest);
+ }
+@@ -179,9 +188,6 @@
+ #endif // AMD64
+
+ inline jint _Atomic_xchg(jint exchange_value, volatile jint* dest) {
+-
+- // 32bit version originally did nothing!!
+-
+ __asm__ __volatile__ ("xchgl (%2),%0"
+ : "=r" (exchange_value)
+ : "0" (exchange_value), "r" (dest)
+diff -r 13f94cc87253 -r 379b95785a1f src/os_cpu/solaris_x86/vm/solaris_x86_32.il
+--- openjdk.orig/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il Fri Jun 18 01:17:46 2010 -0700
+--- openjdk/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il Fri Aug 27 20:12:31 2010 +0100
+@@ -50,10 +50,12 @@
+ movl 4(%esp), %edx // dest
+ movl %eax, %ecx
+ cmpl $0, 8(%esp) // MP test
+- je 1f
+- lock
+-1: xaddl %eax, (%edx)
+- addl %ecx, %eax
++ jne 1f
++ xaddl %eax, (%edx)
++ jmp 2f
++1: lock
++ xaddl %eax, (%edx)
++2: addl %ecx, %eax
+ .end
+
+ // Support for jint Atomic::xchg(jint exchange_value, volatile jint* dest).
+@@ -72,9 +74,12 @@
+ movl 0(%esp), %ecx // exchange_value
+ movl 4(%esp), %edx // dest
+ cmp $0, 12(%esp) // MP test
+- je 1f
+- lock
+-1: cmpxchgl %ecx, (%edx)
++ jne 1f
++ cmpxchgl %ecx, (%edx)
++ jmp 2f
++1: lock
++ cmpxchgl %ecx, (%edx)
++2:
+ .end
+
+ // Support for jlong Atomic::cmpxchg(jlong exchange_value,
+@@ -90,10 +95,12 @@
+ movl 8(%esp), %ebx // exchange_value (low)
+ movl 12(%esp), %ecx // exchange_high (high)
+ cmp $0, 28(%esp) // MP test
+- je 1f
+- lock
+-1: cmpxchg8b (%edi)
+- popl %edi
++ jne 1f
++ cmpxchg8b (%edi)
++ jmp 2f
++1: lock
More information about the distro-pkg-dev
mailing list