diff options
| author | tnn <tnn> | 2015-02-21 20:21:56 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2015-02-21 20:21:56 +0000 |
| commit | dda0feaf0beb021a2d9dd7e96828b4c7b9f3bf05 (patch) | |
| tree | b877ba7814505ba468f31fcc2ba0a240f897a7eb /lang/openjdk8/patches | |
| parent | 793ce6dcb577e23ad3e35c5f087225568abeb250 (diff) | |
| download | pkgsrc-dda0feaf0beb021a2d9dd7e96828b4c7b9f3bf05.tar.gz | |
Fix more ARM defines
Diffstat (limited to 'lang/openjdk8/patches')
| -rw-r--r-- | lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_defs.make | 14 | ||||
| -rw-r--r-- | lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_gcc.make | 15 |
2 files changed, 21 insertions, 8 deletions
diff --git a/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_defs.make b/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_defs.make index af282fd4832..ef5c3bbb941 100644 --- a/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_defs.make +++ b/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_defs.make @@ -1,17 +1,15 @@ -$NetBSD: patch-hotspot_make_bsd_makefiles_defs.make,v 1.1 2015/02/08 08:41:25 tnn Exp $ +$NetBSD: patch-hotspot_make_bsd_makefiles_defs.make,v 1.2 2015/02/21 20:21:56 tnn Exp $ -64-bit support. +Fix architecture name. --- hotspot/make/bsd/makefiles/defs.make.orig 2015-02-02 15:32:37.000000000 +0000 +++ hotspot/make/bsd/makefiles/defs.make -@@ -30,6 +30,10 @@ SLASH_JAVA ?= /java +@@ -29,7 +29,7 @@ + SLASH_JAVA ?= /java # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name - ARCH:=$(shell uname -m) -+ifeq ($(ARCH),x86_64) -+ ARCH=amd64 -+endif -+ +-ARCH:=$(shell uname -m) ++ARCH:=$(shell uname -m | sed -e 's,x86_64,amd64,' -e 's,.*arm.*,arm,') PATH_SEP = : ifeq ($(LP64), 1) ARCH_DATA_MODEL ?= 64 diff --git a/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_gcc.make b/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_gcc.make new file mode 100644 index 00000000000..f032047c445 --- /dev/null +++ b/lang/openjdk8/patches/patch-hotspot_make_bsd_makefiles_gcc.make @@ -0,0 +1,15 @@ +$NetBSD: patch-hotspot_make_bsd_makefiles_gcc.make,v 1.1 2015/02/21 20:21:56 tnn Exp $ + +Don't build with -O3 on ARM; produces flaky results with GCC 4.8.2. + +--- hotspot/make/bsd/makefiles/gcc.make.orig 2015-02-02 15:32:37.000000000 +0000 ++++ hotspot/make/bsd/makefiles/gcc.make +@@ -298,6 +298,8 @@ ifeq ($(OS_VENDOR), Darwin) + # use -Os by default, unless -O3 can be proved to be worth the cost, as per policy + # <http://wikis.sun.com/display/OpenJDK/Mac+OS+X+Port+Compilers> + OPT_CFLAGS_DEFAULT ?= SIZE ++else ifeq ($(LIBARCH), arm) ++ OPT_CFLAGS_DEFAULT ?= SIZE + else + OPT_CFLAGS_DEFAULT ?= SPEED + endif |