svn commit: r386894 - in branches/2015Q2/java/openjdk6: . files

[Jung-uk Kim]

Author: jkim
Date: Wed May 20 21:38:31 2015
New Revision: 386894
URL: https://svnweb.freebsd.org/changeset/ports/386894

Log:
  MFH:	r386893
  
  Fix build without precompiled headers and apply r384056 to java/openjdk6.
  
  Approved by:	ports-secteam (delphij)

Modified:
  branches/2015Q2/java/openjdk6/Makefile
  branches/2015Q2/java/openjdk6/files/patch-set
Directory Properties:
  branches/2015Q2/   (props changed)

Modified: branches/2015Q2/java/openjdk6/Makefile
==============================================================================
--- branches/2015Q2/java/openjdk6/Makefile	Wed May 20 21:05:25 2015	(r386893)
+++ branches/2015Q2/java/openjdk6/Makefile	Wed May 20 21:38:31 2015	(r386894)
@@ -186,6 +186,18 @@ COPYFILES=	\
 
 .include <bsd.port.pre.mk>
 
+.if ${COMPILER_TYPE} == clang
+.if ${COMPILER_VERSION} >= 35
+MAKE_ENV+=	COMPILER_WARNINGS_FATAL=false
+.endif
+MAKE_ENV+=	USE_CLANG=true
+.endif
+
+# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html
+.if ${COMPILER_TYPE} == gcc
+MAKE_ENV+=	USE_PRECOMPILED_HEADER=0
+.endif
+
 .if empty(ICONV_LIB)
 ICONV_CPPFLAGS=	-DLIBICONV_PLUG
 .else
@@ -194,13 +206,6 @@ ICONV_LDFLAGS=	-L${LOCALBASE}/lib ${ICON
 .endif
 ZLIB_LDFLAGS?=	-lz
 
-.if ${COMPILER_TYPE} == "clang"
-.if ${COMPILER_VERSION} >= 35
-MAKE_ENV+=	COMPILER_WARNINGS_FATAL=false
-.endif
-MAKE_ENV+=	USE_CLANG=true
-.endif
-
 post-extract:
 	@for d in ${COPYDIRS}; do \
 		${MKDIR} `echo ${WRKSRC}/$$d | ${SED} 's/linux/bsd/g;'`; \

Modified: branches/2015Q2/java/openjdk6/files/patch-set
==============================================================================
--- branches/2015Q2/java/openjdk6/files/patch-set	Wed May 20 21:05:25 2015	(r386893)
+++ branches/2015Q2/java/openjdk6/files/patch-set	Wed May 20 21:38:31 2015	(r386894)
@@ -2525,6 +2525,16 @@
  #endif // PRODUCT
      } else {
        assert(_real_start_word == NULL && _real_end_word == NULL, "invariant");
+--- hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp
++++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp
+@@ -25,6 +25,7 @@
+ #ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_INLINE_HPP
+ #define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_INLINE_HPP
+ 
++#include "gc_implementation/parallelScavenge/psOldGen.hpp"
+ #include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
+ #include "gc_implementation/parallelScavenge/psScavenge.hpp"
+ 
 --- hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp
 +++ hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp
 @@ -144,9 +144,9 @@