diff options
author | joerg <joerg@pkgsrc.org> | 2015-03-31 15:45:40 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2015-03-31 15:45:40 +0000 |
commit | f57358d9d560de1f4cf1bf073f86f032f33290b3 (patch) | |
tree | da6b66ce8e67e079ca7a68aeadbd8252b315d8d9 /lang/openjdk7/patches | |
parent | 506be6ee20878a7de11540f0d65a7ff3bc025bfe (diff) | |
download | pkgsrc-f57358d9d560de1f4cf1bf073f86f032f33290b3.tar.gz |
Don't mess with __sync_*, clang disallows it this way. Failing at link
time is good enough anyway.
Diffstat (limited to 'lang/openjdk7/patches')
-rw-r--r-- | lang/openjdk7/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp b/lang/openjdk7/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp index 2a8c99451a0..47dd444f8d7 100644 --- a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp +++ b/lang/openjdk7/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp,v 1.1 2015/02/22 14:46:40 tnn Exp $ +$NetBSD: patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp,v 1.2 2015/03/31 15:45:40 joerg Exp $ SpinPause() needs to return a proper value, or we can apparently crash. Already fixed in upstream openjdk8, but not in openjdk7. ---- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp.orig 2015-02-22 14:33:30.000000000 +0000 +--- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp.orig 2015-03-25 16:27:54.000000000 +0000 +++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp @@ -464,6 +464,7 @@ void os::print_register_info(outputStrea @@ -13,3 +13,25 @@ Already fixed in upstream openjdk8, but not in openjdk7. } int SafeFetch32(int *adr, int errValue) { +@@ -543,21 +544,6 @@ extern "C" { + } + }; + +-///////////////////////////////////////////////////////////////////////////// +-// Implementations of atomic operations not supported by processors. +-// -- http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Atomic-Builtins.html +- +-#ifndef _LP64 +-extern "C" { +- long long unsigned int __sync_val_compare_and_swap_8( +- volatile void *ptr, +- long long unsigned int oldval, +- long long unsigned int newval) { +- ShouldNotCallThis(); +- } +-}; +-#endif // !_LP64 +- + #ifndef PRODUCT + void os::verify_stack_alignment() { + } |