sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-30 09:56:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Override GCC used by HotSpot SA. [1]

Browse source 
- 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
This commit is contained in:
Jung-uk Kim 2012-09-18 22:30:19 +00:00
parent dbec44b0a4
commit e1b4da42cd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=304470
2 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
java/openjdk6/Makefile
View file

@ -1,9 +1,5 @@
# New ports collection makefile for: openjdk6 # Created by: Brian Gardner <brian@experts-exchange.com>
# Date created: 2009/2/21
# Whom: Brian Gardner <brian@experts-exchange.com>
#
# $FreeBSD$ # $FreeBSD$
#
PORTNAME= openjdk6 PORTNAME= openjdk6
PORTVERSION= b25 PORTVERSION= b25
@ -137,8 +133,8 @@ MAKE_ENV= LANG=C LC_ALL=C \
MILESTONE=fcs \ MILESTONE=fcs \
JDK_UPDATE_VERSION=${UPDATE_VERSION} JDK_UPDATE_VERSION=${UPDATE_VERSION}
# HotSpot wants CCC instead of CXX. # HotSpot wants CCC instead of CXX. Also, HotSpot SA wants GCC.
MAKE_ENV+= CCC="${CXX}" MAKE_ENV+= CCC="${CXX}" GCC="${CC}"
# XXX Turn off -Werror from HotSpot. # XXX Turn off -Werror from HotSpot.
MAKE_ENV+= WARNINGS_ARE_ERRORS="${WARNINGS_ARE_ERRORS}" MAKE_ENV+= WARNINGS_ARE_ERRORS="${WARNINGS_ARE_ERRORS}"

30
java/openjdk6/files/patch-set
View file

@ -609,17 +609,19 @@
#endif /* amd64 */ #endif /* amd64 */
--- hotspot/agent/src/os/bsd/Makefile 2012-01-12 17:22:08.000000000 -0500 --- hotspot/agent/src/os/bsd/Makefile 2012-05-01 17:15:02.000000000 -0400
+++ hotspot/agent/src/os/bsd/Makefile 2012-01-12 16:53:06.000000000 -0500 +++ hotspot/agent/src/os/bsd/Makefile 2012-09-18 17:50:06.000000000 -0400
@@ -22,7 +22,7 @@ @@ -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 ) -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 ) +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 JAVAH = ${JAVA_HOME}/bin/javah
@@ -32,25 +32,24 @@ @@ -32,25 +32,24 @@
libproc_impl.c \ libproc_impl.c \
ps_proc.c \ ps_proc.c \
@ -6490,6 +6492,26 @@
// Only used on 64 bit Windows platforms // Only used on 64 bit Windows platforms
define_pd_global(bool, UseVectoredExceptions, false); 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-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 +++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2012-09-18 14:48:04.000000000 -0400
@@ -78,25 +78,209 @@ @@ -78,25 +78,209 @@