/hg/icedtea7: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Mar 28 18:19:33 UTC 2014
changeset aa5a1fe61c38 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=aa5a1fe61c38
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 28 03:41:03 2014 +0000
Apply Werror fix to aarch64 port.
2012-08-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
(ICEDTEA_PATCHES): Add -Werror patch
from IcedTea7 HEAD.
* patches/hotspot/aarch64/werror.patch:
Allow COMPILER_WARNINGS_FATAL to turn off -Werror.
changeset 715ae9b63c91 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=715ae9b63c91
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 28 18:17:41 2014 +0000
Make ARM32 JIT option help text match actual default.
2014-03-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
* acinclude.m4:
(IT_ENABLE_ARM32JIT): Make help text match setting.
changeset a7f6247d3dff in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=a7f6247d3dff
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 28 18:19:20 2014 +0000
PR1726: configure fails looking for ecj.jar before even trying to find javac
2014-03-28 Andrew John Hughes <gnu.andrew at redhat.com>
* acinclude.m4:
(IT_FIND_COMPILER): Check value of ECJ_JAR
and JAVAC here ...
(IT_FIND_ECJ_JAR): ... rather than here where
${JAVAC} may not yet be defined.
diffstat:
ChangeLog | 21 +++++++++++++++++
Makefile.am | 4 +++
NEWS | 1 +
acinclude.m4 | 13 +++++-----
patches/hotspot/aarch64/werror.patch | 43 ++++++++++++++++++++++++++++++++++++
5 files changed, 76 insertions(+), 6 deletions(-)
diffs (137 lines):
diff -r 2278f72329bf -r a7f6247d3dff ChangeLog
--- a/ChangeLog Thu Mar 27 21:18:02 2014 +0000
+++ b/ChangeLog Fri Mar 28 18:19:20 2014 +0000
@@ -1,3 +1,24 @@
+2014-03-28 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * acinclude.m4:
+ (IT_FIND_COMPILER): Check value of ECJ_JAR
+ and JAVAC here ...
+ (IT_FIND_ECJ_JAR): ... rather than here where
+ ${JAVAC} may not yet be defined.
+
+2014-03-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * acinclude.m4:
+ (IT_ENABLE_ARM32JIT): Make help text match setting.
+
+2012-08-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add -Werror patch
+ from IcedTea7 HEAD.
+ * patches/hotspot/aarch64/werror.patch:
+ Allow COMPILER_WARNINGS_FATAL to turn off -Werror.
+
2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
* hotspot.map:
diff -r 2278f72329bf -r a7f6247d3dff Makefile.am
--- a/Makefile.am Thu Mar 27 21:18:02 2014 +0000
+++ b/Makefile.am Fri Mar 28 18:19:20 2014 +0000
@@ -297,6 +297,10 @@
ICEDTEA_PATCHES += patches/nss-config.patch
endif
+if WITH_ALT_HSBUILD
+ICEDTEA_PATCHES += patches/hotspot/aarch64/werror.patch
+endif
+
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
# Bootstrapping patches
diff -r 2278f72329bf -r a7f6247d3dff NEWS
--- a/NEWS Thu Mar 27 21:18:02 2014 +0000
+++ b/NEWS Fri Mar 28 18:19:20 2014 +0000
@@ -160,6 +160,7 @@
- PR1677, G498288: Update PaX support to detect running PaX kernel and use newer tools
- PR1679: Allow OpenJDK to build on PaX-enabled kernels
- PR1684: Build fails with empty PAX_COMMAND
+ - PR1726: configure fails looking for ecj.jar before even trying to find javac
* PPC & AIX port
- Add AIX-specific build instructions to README-ppc.html
- Added AIX as testing platform for more jtreg tests written in shell-script
diff -r 2278f72329bf -r a7f6247d3dff acinclude.m4
--- a/acinclude.m4 Thu Mar 27 21:18:02 2014 +0000
+++ b/acinclude.m4 Fri Mar 28 18:19:20 2014 +0000
@@ -134,6 +134,12 @@
IT_USING_ECJ
IT_WITH_GCJ
+ if test "x${ECJ_JAR}" = "xno"; then
+ if test "x${JAVAC}" = "x"; then
+ AC_MSG_ERROR("No compiler or ecj JAR file was found.")
+ fi
+ fi
+
if test x"${GCJ}" != xno ; then
JAVAC="${JAVA} -classpath ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main"
fi
@@ -350,11 +356,6 @@
fi
fi
AC_MSG_RESULT(${ECJ_JAR})
- if test "x${ECJ_JAR}" = "xno"; then
- if test "x${JAVAC}" = "x"; then
- AC_MSG_ERROR("No compiler or ecj JAR file was found.")
- fi
- fi
AC_SUBST(ECJ_JAR)
])
@@ -2666,7 +2667,7 @@
[
AC_MSG_CHECKING([whether to enable the ARM32 JIT])
AC_ARG_ENABLE([arm32-jit],
- [AS_HELP_STRING(--enable-arm32-jit,build with the ARM32 JIT [[default=no]])],
+ [AS_HELP_STRING(--enable-arm32-jit,build with the ARM32 JIT [[default=yes]])],
[
case "${enableval}" in
yes)
diff -r 2278f72329bf -r a7f6247d3dff patches/hotspot/aarch64/werror.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/aarch64/werror.patch Fri Mar 28 18:19:20 2014 +0000
@@ -0,0 +1,43 @@
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2014-03-25 14:07:53.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/gcc.make 2014-03-28 03:26:57.229802760 +0000
+@@ -205,7 +205,9 @@
+ endif
+
+ # Compiler warnings are treated as errors
++ifneq ($(COMPILER_WARNINGS_FATAL),false)
+ WARNINGS_ARE_ERRORS = -Werror
++endif
+
+ ifeq ($(USE_CLANG), true)
+ # However we need to clean the code up before we can unrestrictedly enable this option with Clang
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/adlc.make openjdk/hotspot/make/solaris/makefiles/adlc.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/adlc.make 2014-03-25 14:07:53.000000000 +0000
++++ openjdk/hotspot/make/solaris/makefiles/adlc.make 2014-03-28 03:26:02.604988364 +0000
+@@ -73,8 +73,10 @@
+
+ # CFLAGS_WARN holds compiler options to suppress/enable warnings.
+ # Compiler warnings are treated as errors
+-ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
+- CFLAGS_WARN = +w -errwarn
++ifneq ($(COMPILER_WARNINGS_FATAL),false)
++ ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
++ CFLAGS_WARN = +w -errwarn
++ endif
+ endif
+ CFLAGS += $(CFLAGS_WARN)
+
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/gcc.make openjdk/hotspot/make/solaris/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/gcc.make 2014-03-25 14:07:53.000000000 +0000
++++ openjdk/hotspot/make/solaris/makefiles/gcc.make 2014-03-28 03:27:28.206264586 +0000
+@@ -116,7 +116,9 @@
+
+
+ # Compiler warnings are treated as errors
+-WARNINGS_ARE_ERRORS = -Werror
++ifneq ($(COMPILER_WARNINGS_FATAL),false)
++WARNINGS_ARE_ERRORS = -Werror
++endif
+ # Enable these warnings. See 'info gcc' about details on these options
+ WARNING_FLAGS = -Wpointer-arith -Wconversion -Wsign-compare -Wundef
+ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(WARNING_FLAGS)
More information about the distro-pkg-dev
mailing list