/hg/icedtea7: 4 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Fri Oct 28 01:35:07 UTC 2016


changeset cebac2cc1f7a in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=cebac2cc1f7a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Oct 27 06:23:54 2016 +0100

	PR3180: Support building without pre-compiled headers

	2016-10-26  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR3180: Support building without pre-compiled headers
		* INSTALL: Updated.
		* Makefile.am:
		(ICEDTEA_ENV): Set USE_PRECOMPILED_HEADER
		appropriately, according to whether
		DISABLE_PRECOMPILED_HEADERS is defined or not.
		* NEWS: Updated.
		* acinclude.m4:
		(IT_DISABLE_PRECOMPILED_HEADERS): New macro to
		provide the --disable-precompiled-headers option.
		* configure.ac: Invoke IT_DISABLE_PRECOMPILED_HEADERS.


changeset 18f2aec9b670 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=18f2aec9b670
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Oct 27 07:01:33 2016 +0100

	PR3211: AArch64 build fails with pre-compiled headers disabled

	2016-10-26  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR3211: AArch64 build fails with pre-compiled
		headers disabled
		* Makefile.am:
		(ICEDTEA_PATCHES): Add patch for PR3211.
		* NEWS: Updated.
		* patches/pr3211.patch:
		Add missing includes to AArch64 port.


changeset 3e24116d0925 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=3e24116d0925
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Oct 27 18:28:42 2016 +0100

	Backout S8157306, PR3209: Random infrequent null pointer exceptions in javac

	2016-10-27  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		S8157306, PR3209: Random infrequent null pointer
		exceptions in javac
		* Makefile.am:
		(ICEDTEA_PATCHES): Add backout patch for PR3209.
		* NEWS: Remove PR3209.
		* patches/pr3209-backout.patch:
		Backout PR3209 as it won't work without 8023988.


changeset 7960746077db in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=7960746077db
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Oct 28 02:40:09 2016 +0100

	Added tag icedtea-2.7.0pre08 for changeset 3e24116d0925


diffstat:

 .hgtags                      |   1 +
 ChangeLog                    |  34 ++++++++++++++++++++++++++++++++++
 INSTALL                      |   1 +
 Makefile.am                  |  10 +++++++++-
 NEWS                         |   4 +++-
 acinclude.m4                 |  22 ++++++++++++++++++++++
 configure.ac                 |   1 +
 patches/pr3209-backout.patch |  28 ++++++++++++++++++++++++++++
 patches/pr3211.patch         |  33 +++++++++++++++++++++++++++++++++
 9 files changed, 132 insertions(+), 2 deletions(-)

diffs (218 lines):

diff -r 47c21fc24330 -r 7960746077db .hgtags
--- a/.hgtags	Thu Oct 27 05:40:14 2016 +0100
+++ b/.hgtags	Fri Oct 28 02:40:09 2016 +0100
@@ -66,3 +66,4 @@
 89430c9d091b5a0a51d8ddf3111bf9f0ef038ff8 icedtea-2.7.0pre05
 585a1a8b57bf67d3b66af9c97e406cce1f5a01d5 icedtea-2.7.0pre06
 11416bb1b3088da4cacdb76646c83ab17dbcc842 icedtea-2.7.0pre07
+3e24116d0925954d0f117c9525a41833441d1be5 icedtea-2.7.0pre08
diff -r 47c21fc24330 -r 7960746077db ChangeLog
--- a/ChangeLog	Thu Oct 27 05:40:14 2016 +0100
+++ b/ChangeLog	Fri Oct 28 02:40:09 2016 +0100
@@ -1,3 +1,37 @@
+2016-10-27  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	S8157306, PR3209: Random infrequent null pointer
+	exceptions in javac
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add backout patch for PR3209.
+	* NEWS: Remove PR3209.
+	* patches/pr3209-backout.patch:
+	Backout PR3209 as it won't work without 8023988.
+
+2016-10-26  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR3211: AArch64 build fails with pre-compiled
+	headers disabled
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add patch for PR3211.
+	* NEWS: Updated.
+	* patches/pr3211.patch:
+	Add missing includes to AArch64 port.
+
+2016-10-26  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR3180: Support building without pre-compiled headers
+	* INSTALL: Updated.
+	* Makefile.am:
+	(ICEDTEA_ENV): Set USE_PRECOMPILED_HEADER
+	appropriately, according to whether
+	DISABLE_PRECOMPILED_HEADERS is defined or not.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_DISABLE_PRECOMPILED_HEADERS): New macro to
+	provide the --disable-precompiled-headers option.
+	* configure.ac: Invoke IT_DISABLE_PRECOMPILED_HEADERS.
+
 2016-10-26  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	Bump to icedtea-2.7.0pre08.
diff -r 47c21fc24330 -r 7960746077db INSTALL
--- a/INSTALL	Thu Oct 27 05:40:14 2016 +0100
+++ b/INSTALL	Fri Oct 28 02:40:09 2016 +0100
@@ -258,6 +258,7 @@
 * --enable-split-debuginfo: Strip debuginfo from binaries and libraries
   and install in .debug files under ${libdir}/debug instead.  objcopy
   from binutils must be available to perform the stripping.
+* --disable-precompiled-headers: Don't use pre-compiled headers.
 
 Testing
 =======
diff -r 47c21fc24330 -r 7960746077db Makefile.am
--- a/Makefile.am	Thu Oct 27 05:40:14 2016 +0100
+++ b/Makefile.am	Fri Oct 28 02:40:09 2016 +0100
@@ -371,7 +371,7 @@
 
 # Patch list
 
-ICEDTEA_PATCHES = 
+ICEDTEA_PATCHES = patches/pr3211.patch patches/pr3209-backout.patch
 
 # Conditional patches
 
@@ -747,6 +747,14 @@
 	ALT_CACERTS_FILE="${CACERTS_FILE}"
 endif
 
+if DISABLE_PRECOMPILED_HEADERS
+ICEDTEA_ENV += \
+	USE_PRECOMPILED_HEADER=0
+else
+ICEDTEA_ENV += \
+	USE_PRECOMPILED_HEADER=1
+endif
+
 # OpenJDK boot build environment.
 ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
 	BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \
diff -r 47c21fc24330 -r 7960746077db NEWS
--- a/NEWS	Thu Oct 27 05:40:14 2016 +0100
+++ b/NEWS	Fri Oct 28 02:40:09 2016 +0100
@@ -16,6 +16,8 @@
 
 * Security fixes
   - PR3207, RH1367357: lcms2: Out-of-bounds read in Type_MLU_Read()
+* New features
+  - PR3180: Support building without pre-compiled headers
 * Backports
   - S6604109, PR3162: javax.print.PrintServiceLookup.lookupPrintServices fails SOMETIMES for Cups
   - S6907252, PR3162: ZipFileInputStream Not Thread-Safe
@@ -58,8 +60,8 @@
   - PR3162: Remove reference to AbstractPlainDatagramSocketImpl.c, removed in 8072466
   - PR3166: invalid zip timestamp handling leads to error building bootstrap-javac
 * AArch64 port
-  - S8157306, PR3209: Random infrequent null pointer exceptions in javac
   - S8167200: AArch64: Broken stack pointer adjustment in interpreter
+  - PR3211: AArch64 build fails with pre-compiled headers disabled
 
 New in release 2.6.7 (2016-07-28):
 
diff -r 47c21fc24330 -r 7960746077db acinclude.m4
--- a/acinclude.m4	Thu Oct 27 05:40:14 2016 +0100
+++ b/acinclude.m4	Fri Oct 28 02:40:09 2016 +0100
@@ -3452,3 +3452,25 @@
   AC_MSG_RESULT([$disable_systemtap_tests])
   AM_CONDITIONAL([DISABLE_SYSTEMTAP_TESTS], test x"${disable_systemtap_tests}" = "xyes")
 ])
+
+AC_DEFUN_ONCE([IT_DISABLE_PRECOMPILED_HEADERS],
+[
+  AC_MSG_CHECKING([whether to disable the use of pre-compiled headers])
+  AC_ARG_ENABLE([precompiled-headers],
+                [AS_HELP_STRING(--disable-precompiled-headers,do not use pre-compiled headers [[default=no]])],
+  [
+    case "${enableval}" in
+      no)
+        disable_precompiled_headers=yes
+        ;;
+      *)
+        disable_precompiled_headers=no
+        ;;
+    esac
+  ],
+  [
+    disable_precompiled_headers=no
+  ])
+  AC_MSG_RESULT([$disable_precompiled_headers])
+  AM_CONDITIONAL([DISABLE_PRECOMPILED_HEADERS], test x"${disable_precompiled_headers}" = "xyes")
+])
diff -r 47c21fc24330 -r 7960746077db configure.ac
--- a/configure.ac	Thu Oct 27 05:40:14 2016 +0100
+++ b/configure.ac	Fri Oct 28 02:40:09 2016 +0100
@@ -61,6 +61,7 @@
 IT_ENABLE_SUNEC
 IT_ENABLE_NATIVE_DEBUGINFO
 IT_ENABLE_JAVA_DEBUGINFO
+IT_DISABLE_PRECOMPILED_HEADERS
 
 IT_WITH_FONTS_DIR
 AC_CONFIG_FILES([linux.fontconfig.Gentoo.properties])
diff -r 47c21fc24330 -r 7960746077db patches/pr3209-backout.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pr3209-backout.patch	Fri Oct 28 02:40:09 2016 +0100
@@ -0,0 +1,28 @@
+# HG changeset patch
+# User andrew
+# Date 1477589125 -3600
+#      Thu Oct 27 18:25:25 2016 +0100
+# Node ID fff29c78ee406a290e5b79dc14a1b1a98de1d0f4
+# Parent  f23cc792224c21431b71da6a31ab751ac6f5c236
+PR3209: Backed out changeset 3cc3ab869ccf
+
+diff --git a/src/share/vm/opto/lcm.cpp b/src/share/vm/opto/lcm.cpp
+--- openjdk/hotspot/src/share/vm/opto/lcm.cpp
++++ openjdk/hotspot/src/share/vm/opto/lcm.cpp
+@@ -1068,14 +1068,11 @@
+     Block *sb = _succs[i];
+     // Clone the entire area; ignoring the edge fixup for now.
+     for( uint j = end; j > beg; j-- ) {
++      // It is safe here to clone a node with anti_dependence
++      // since clones dominate on each path.
+       Node *clone = _nodes[j-1]->clone();
+       sb->_nodes.insert( 1, clone );
+       bbs.map(clone->_idx,sb);
+-#ifdef AARCH64
+-      if (clone->needs_anti_dependence_check()) {
+-        insert_anti_dependences(sb, clone);
+-      }
+-#endif
+     }
+   }
+ 
diff -r 47c21fc24330 -r 7960746077db patches/pr3211.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pr3211.patch	Fri Oct 28 02:40:09 2016 +0100
@@ -0,0 +1,33 @@
+# HG changeset patch
+# User andrew
+# Date 1477547871 -3600
+#      Thu Oct 27 06:57:51 2016 +0100
+# Node ID f23cc792224c21431b71da6a31ab751ac6f5c236
+# Parent  76e61db9631544414570a5238b66c12465e6a821
+PR3211: AArch64 build fails with pre-compiled headers disabled
+Contributed-by: Tiago Stürmer Daitx <tdaitx at gmail.com>
+
+diff --git a/src/cpu/aarch64/vm/assembler_aarch64.cpp b/src/cpu/aarch64/vm/assembler_aarch64.cpp
+--- openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp
++++ openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp
+@@ -64,6 +64,7 @@
+ #include "gc_implementation/g1/heapRegion.hpp"
+ #endif
+ 
++#include "opto/compile.hpp"
+ 
+ extern "C" void entry(CodeBuffer *cb);
+ 
+diff --git a/src/cpu/aarch64/vm/vm_version_aarch64.cpp b/src/cpu/aarch64/vm/vm_version_aarch64.cpp
+--- openjdk/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp
++++ openjdk/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp
+@@ -25,6 +25,9 @@
+  */
+ 
+ #include "precompiled.hpp"
++#include "asm/assembler.hpp"
++#include "asm/assembler.inline.hpp"
++#include "utilities/sizes.hpp"
+ #include "assembler_aarch64.hpp"
+ #include "memory/resourceArea.hpp"
+ #include "runtime/java.hpp"


More information about the distro-pkg-dev mailing list