diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-09-18 22:30:19 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-09-18 22:30:19 +0000 |
| commit | e1b4da42cde91602136a53d89067f9bde67d93b9 (patch) | |
| tree | 1cdb8bf470879ba001d58b618db8218eb2a602e1 /java/openjdk6 | |
| parent | dbec44b0a446903c775ef9800a379b60c322f67d (diff) | |
| download | ports-e1b4da42cde91602136a53d89067f9bde67d93b9.tar.gz ports-e1b4da42cde91602136a53d89067f9bde67d93b9.zip | |
- Override GCC used by HotSpot SA. [1]
- Fix build with GCC 4.5+ on i386. [2]
- Convert to the new header format.
Submitted by: Claude Buisson (clbuisson at orange dot fr) [1]
Obtained from: OpenJDK7 [2]
http://hg.openjdk.java.net/jdk7/hotspot/hotspot/rev/da880ba4edf9
Notes
Notes:
svn path=/head/; revision=304470
Diffstat (limited to 'java/openjdk6')
| -rw-r--r-- | java/openjdk6/Makefile | 10 | ||||
| -rw-r--r-- | java/openjdk6/files/patch-set | 30 |
2 files changed, 29 insertions, 11 deletions
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile index d9d55c22b093..7485625570f4 100644 --- a/java/openjdk6/Makefile +++ b/java/openjdk6/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: openjdk6 -# Date created: 2009/2/21 -# Whom: Brian Gardner <brian@experts-exchange.com> -# +# Created by: Brian Gardner <brian@experts-exchange.com> # $FreeBSD$ -# PORTNAME= openjdk6 PORTVERSION= b25 @@ -137,8 +133,8 @@ MAKE_ENV= LANG=C LC_ALL=C \ MILESTONE=fcs \ JDK_UPDATE_VERSION=${UPDATE_VERSION} -# HotSpot wants CCC instead of CXX. -MAKE_ENV+= CCC="${CXX}" +# HotSpot wants CCC instead of CXX. Also, HotSpot SA wants GCC. +MAKE_ENV+= CCC="${CXX}" GCC="${CC}" # XXX Turn off -Werror from HotSpot. MAKE_ENV+= WARNINGS_ARE_ERRORS="${WARNINGS_ARE_ERRORS}" diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set index a82dbf82ac86..73f3034e0175 100644 --- a/java/openjdk6/files/patch-set +++ b/java/openjdk6/files/patch-set @@ -609,17 +609,19 @@ #endif /* amd64 */ ---- hotspot/agent/src/os/bsd/Makefile 2012-01-12 17:22:08.000000000 -0500 -+++ hotspot/agent/src/os/bsd/Makefile 2012-01-12 16:53:06.000000000 -0500 -@@ -22,7 +22,7 @@ +--- hotspot/agent/src/os/bsd/Makefile 2012-05-01 17:15:02.000000000 -0400 ++++ hotspot/agent/src/os/bsd/Makefile 2012-09-18 17:50:06.000000000 -0400 +@@ -22,8 +22,8 @@ # # -ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi ) +-GCC = gcc +ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "amd64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi ) - GCC = gcc ++GCC ?= gcc JAVAH = ${JAVA_HOME}/bin/javah + @@ -32,25 +32,24 @@ libproc_impl.c \ ps_proc.c \ @@ -6490,6 +6492,26 @@ // Only used on 64 bit Windows platforms define_pd_global(bool, UseVectoredExceptions, false); +--- hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp 2012-05-01 17:15:08.000000000 -0400 ++++ hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp 2012-09-18 18:21:03.000000000 -0400 +@@ -93,7 +93,7 @@ + + inline void OrderAccess::store_fence(jbyte* p, jbyte v) { + __asm__ volatile ( "xchgb (%2),%0" +- : "=r" (v) ++ : "=q" (v) + : "0" (v), "r" (p) + : "memory"); + } +@@ -155,7 +155,7 @@ + // Must duplicate definitions instead of calling store_fence because we don't want to cast away volatile. + inline void OrderAccess::release_store_fence(volatile jbyte* p, jbyte v) { + __asm__ volatile ( "xchgb (%2),%0" +- : "=r" (v) ++ : "=q" (v) + : "0" (v), "r" (p) + : "memory"); + } --- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2012-05-01 17:15:08.000000000 -0400 +++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2012-09-18 14:48:04.000000000 -0400 @@ -78,25 +78,209 @@ |