cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix clang + fastdebug issue in loopPredicate.cpp

Browse Source 
- use HW_PHYSMEM64 to correct assert in fastdebug
This commit is contained in:
kurt 2017-04-24 15:25:49 +00:00
parent 31affefad6
commit aec6c735a6
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/jdk/1.8/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2017/04/23 02:32:34 espie Exp $
# $OpenBSD: Makefile,v 1.21 2017/04/24 15:25:49 kurt Exp $
ONLY_FOR_ARCHS= i386 amd64
# XXX clang-built jdk on amd64 hangs on everything
@ -14,7 +14,7 @@ PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}
PKGNAME-jre= jre-${V}
EPOCH= 0
REVISION= 3
REVISION= 4
DIST_SUBDIR= jdk
DISTNAME= openjdk-8u121b13-bsd-port-20170201

12
devel/jdk/1.8/patches/patch-hotspot_src_os_bsd_vm_os_bsd_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.1 2017/04/24 15:25:49 kurt Exp $
--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig Wed Feb 1 16:16:01 2017
+++ hotspot/src/os/bsd/vm/os_bsd.cpp Mon Apr 24 09:54:27 2017
@@ -311,6 +311,8 @@ void os::Bsd::initialize_system_info() {
#if defined (HW_MEMSIZE) // Apple
mib[1] = HW_MEMSIZE;
+#elif defined(HW_PHYSMEM64) // OpenBSD & NetBSD
+ mib[1] = HW_PHYSMEM64;
#elif defined(HW_PHYSMEM) // Most of BSD
mib[1] = HW_PHYSMEM;
#elif defined(HW_REALMEM) // Old FreeBSD

12
devel/jdk/1.8/patches/patch-hotspot_src_share_vm_opto_loopPredicate_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-hotspot_src_share_vm_opto_loopPredicate_cpp,v 1.1 2017/04/24 15:25:49 kurt Exp $
--- hotspot/src/share/vm/opto/loopPredicate.cpp.orig Sun Apr 23 11:47:46 2017
+++ hotspot/src/share/vm/opto/loopPredicate.cpp Sun Apr 23 11:48:21 2017
@@ -778,7 +778,7 @@ bool PhaseIdealLoop::loop_predication_impl(IdealLoopTr
Node* idx = cmp->in(1);
assert(!invar.is_invariant(idx), "index is variant");
Node* rng = cmp->in(2);
- assert(rng->Opcode() == Op_LoadRange || _igvn.type(rng)->is_int() >= 0, "must be");
+ assert(rng->Opcode() == Op_LoadRange || _igvn.type(rng)->is_int(), "must be");
assert(invar.is_invariant(rng), "range must be invariant");
int scale = 1;
Node* offset = zero;