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 | |
| 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')
| -rw-r--r-- | lang/openjdk7/distinfo | 4 | ||||
| -rw-r--r-- | lang/openjdk7/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp | 26 |
2 files changed, 26 insertions, 4 deletions
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo index 31dfc45a621..b686930dd35 100644 --- a/lang/openjdk7/distinfo +++ b/lang/openjdk7/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.81 2015/03/06 12:11:54 tnn Exp $ +$NetBSD: distinfo,v 1.82 2015/03/31 15:45:40 joerg Exp $ SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306 RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260 @@ -86,7 +86,7 @@ SHA1 (patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp) = 9f7acf1eff3baba43 SHA1 (patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp) = dcd83b65a7d74e153a3e1c44f8c7980827ec20c7 SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = e87224f8b67dc78fa411d30beff82ce5ccbb4cc5 SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp) = 6311d68db9064afc470f1d9fd37e63011899659a -SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp) = fd2c290ec83813c4cc40a4af980124c7b3104c7c +SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp) = d82b08803f71d68d6123a2e31e1280a6c2c5bb0e SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = b2ffc4679a4abe581c6ef3aef630b6570e5cfc41 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() { + } |