diff options
author | tnn <tnn@pkgsrc.org> | 2015-02-21 20:21:56 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2015-02-21 20:21:56 +0000 |
commit | b8398813a2b65f5f4b9993448c8825f9957e0e9c (patch) | |
tree | b877ba7814505ba468f31fcc2ba0a240f897a7eb /lang/openjdk7/patches | |
parent | 099b9d144e7d14333e49d9a243f91ea74e483bf9 (diff) | |
download | pkgsrc-b8398813a2b65f5f4b9993448c8825f9957e0e9c.tar.gz |
Fix more ARM defines
Diffstat (limited to 'lang/openjdk7/patches')
-rw-r--r-- | lang/openjdk7/patches/patch-ah | 27 | ||||
-rw-r--r-- | lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_defs.make | 16 | ||||
-rw-r--r-- | lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_gcc.make | 15 |
3 files changed, 45 insertions, 13 deletions
diff --git a/lang/openjdk7/patches/patch-ah b/lang/openjdk7/patches/patch-ah index 8e0ac1d9da7..cd2a9495e52 100644 --- a/lang/openjdk7/patches/patch-ah +++ b/lang/openjdk7/patches/patch-ah @@ -1,10 +1,10 @@ -$NetBSD: patch-ah,v 1.5 2013/06/23 17:39:43 jperkin Exp $ +$NetBSD: patch-ah,v 1.6 2015/02/21 20:21:56 tnn Exp $ DragonFly support. - Disable SunOS multiarch. +Add ARM support. ---- jdk/make/common/shared/Platform.gmk.orig 2013-06-21 13:12:13.786915027 +0000 +--- jdk/make/common/shared/Platform.gmk.orig 2015-01-26 15:20:57.000000000 +0000 +++ jdk/make/common/shared/Platform.gmk @@ -119,7 +119,7 @@ ifeq ($(SYSTEM_UNAME), SunOS) ARCH := $(shell isainfo -n) @@ -29,7 +29,26 @@ Disable SunOS multiarch. ifeq ($(SYSTEM_UNAME), Darwin) PLATFORM = macosx OS_NAME = darwin -@@ -371,9 +378,9 @@ ifeq ($(PLATFORM), bsd) +@@ -340,6 +347,9 @@ ifeq ($(PLATFORM), bsd) + "Power Macintosh") \ + echo ppc \ + ;; \ ++ *arm*) \ ++ echo arm \ ++ ;; \ + *) \ + echo $(mach) \ + ;; \ +@@ -348,7 +358,7 @@ ifeq ($(PLATFORM), bsd) + ARCH_FAMILY := $(ARCH) + + # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64 +- ifneq (,$(findstring $(ARCH), i586 sparc ppc)) ++ ifneq (,$(findstring $(ARCH), i586 sparc ppc arm)) + ARCH_DATA_MODEL=32 + else + ARCH_DATA_MODEL=64 +@@ -371,9 +381,9 @@ ifeq ($(PLATFORM), bsd) REQUIRED_FREE_SPACE=1500000 # How much RAM does this machine have: ifeq ($(OS_VENDOR), OpenBSD) diff --git a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_defs.make b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_defs.make index 2458389f236..11cefd84700 100644 --- a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_defs.make +++ b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_defs.make @@ -1,17 +1,15 @@ -$NetBSD: patch-hotspot_make_bsd_makefiles_defs.make,v 1.3 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-hotspot_make_bsd_makefiles_defs.make,v 1.4 2015/02/21 20:21:56 tnn Exp $ -64-bit support. +Fix architecture name. ---- hotspot/make/bsd/makefiles/defs.make.orig 2013-05-29 03:57:57.000000000 +0000 +--- hotspot/make/bsd/makefiles/defs.make.orig 2015-01-26 15:21:52.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/openjdk7/patches/patch-hotspot_make_bsd_makefiles_gcc.make b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_gcc.make new file mode 100644 index 00000000000..d3d361b50d5 --- /dev/null +++ b/lang/openjdk7/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-01-26 15:21:52.000000000 +0000 ++++ hotspot/make/bsd/makefiles/gcc.make +@@ -196,6 +196,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 += -Os ++else ifeq ($(LIBARCH), arm) ++ OPT_CFLAGS += -Os + else + OPT_CFLAGS += -O3 + endif |