summaryrefslogtreecommitdiff
path: root/java/openjdk6/files/patch-set
diff options
context:
space:
mode:
Diffstat (limited to 'java/openjdk6/files/patch-set')
-rw-r--r--java/openjdk6/files/patch-set30
1 files changed, 26 insertions, 4 deletions
diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set
index a82dbf82ac86..73f3034e0175 100644
--- a/java/openjdk6/files/patch-set
+++ b/java/openjdk6/files/patch-set
@@ -609,17 +609,19 @@
#endif /* amd64 */
---- hotspot/agent/src/os/bsd/Makefile 2012-01-12 17:22:08.000000000 -0500
-+++ hotspot/agent/src/os/bsd/Makefile 2012-01-12 16:53:06.000000000 -0500
-@@ -22,7 +22,7 @@
+--- hotspot/agent/src/os/bsd/Makefile 2012-05-01 17:15:02.000000000 -0400
++++ hotspot/agent/src/os/bsd/Makefile 2012-09-18 17:50:06.000000000 -0400
+@@ -22,8 +22,8 @@
#
#
-ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi )
+-GCC = gcc
+ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "amd64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi )
- GCC = gcc
++GCC ?= gcc
JAVAH = ${JAVA_HOME}/bin/javah
+
@@ -32,25 +32,24 @@
libproc_impl.c \
ps_proc.c \
@@ -6490,6 +6492,26 @@
// Only used on 64 bit Windows platforms
define_pd_global(bool, UseVectoredExceptions, false);
+--- hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp 2012-05-01 17:15:08.000000000 -0400
++++ hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp 2012-09-18 18:21:03.000000000 -0400
+@@ -93,7 +93,7 @@
+
+ inline void OrderAccess::store_fence(jbyte* p, jbyte v) {
+ __asm__ volatile ( "xchgb (%2),%0"
+- : "=r" (v)
++ : "=q" (v)
+ : "0" (v), "r" (p)
+ : "memory");
+ }
+@@ -155,7 +155,7 @@
+ // Must duplicate definitions instead of calling store_fence because we don't want to cast away volatile.
+ inline void OrderAccess::release_store_fence(volatile jbyte* p, jbyte v) {
+ __asm__ volatile ( "xchgb (%2),%0"
+- : "=r" (v)
++ : "=q" (v)
+ : "0" (v), "r" (p)
+ : "memory");
+ }
--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2012-05-01 17:15:08.000000000 -0400
+++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2012-09-18 14:48:04.000000000 -0400
@@ -78,25 +78,209 @@