Mercurial > hg > release > icedtea7-2.3

changeset 2589:d5da77c3198a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include latest 2.3 branch changes, bringing us to 2.3.1. 2012-08-29 Andrew John Hughes <gnu_andrew@member.fsf.org> * patches/7192804-jvisualvm.patch, * patches/no_diz_files.patch, * patches/werror-hotspot.patch, * patches/werror-jdk.patch, * patches/werror-langtools.patch: Dropped; in IcedTea7 2.3 forest. * Makefile.am: (OPENJDK_VERSION): Bump to b30. (CORBA_CHANGESET): Update to IcedTea7 2.3 forest head; the tag icedtea-2.3.1. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Reverted to empty. * hotspot.map: Update default to head of IcedTea7 2.3 forest HotSpot.
author andrew
date Wed, 29 Aug 2012 19:58:08 +0100
parents 6c92810a0b55
children a4c55fb53a2d
files ChangeLog Makefile.am hotspot.map patches/7192804-jvisualvm.patch patches/no_diz_files.patch patches/werror-hotspot.patch patches/werror-jdk.patch patches/werror-langtools.patch
diffstat 8 files changed, 42 insertions(+), 356 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Aug 29 12:17:15 2012 +0100
+++ b/ChangeLog	Wed Aug 29 19:58:08 2012 +0100
@@ -1,3 +1,30 @@
+2012-08-29  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* patches/7192804-jvisualvm.patch,
+	* patches/no_diz_files.patch,
+	* patches/werror-hotspot.patch,
+	* patches/werror-jdk.patch,
+	* patches/werror-langtools.patch:
+	Dropped; in IcedTea7 2.3 forest.
+	* Makefile.am:
+	(OPENJDK_VERSION): Bump to b30.
+	(CORBA_CHANGESET): Update to IcedTea7 2.3 forest head;
+	the tag icedtea-2.3.1.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	(ICEDTEA_PATCHES): Reverted to empty.
+	* hotspot.map: Update default to head of IcedTea7 2.3
+	forest HotSpot.
+
 2012-08-24  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* Makefile.am,
--- a/Makefile.am	Wed Aug 29 12:17:15 2012 +0100
+++ b/Makefile.am	Wed Aug 29 19:58:08 2012 +0100
@@ -1,22 +1,22 @@
 # Dependencies
 
-OPENJDK_VERSION = b20
+OPENJDK_VERSION = b30
 JDK_UPDATE_VERSION = 06
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 
-CORBA_CHANGESET = 2b1d2e9aea32
-JAXP_CHANGESET = 20e3c00ca7ae
-JAXWS_CHANGESET = 410de4b438cf
-JDK_CHANGESET = 903978f9ea49
-LANGTOOLS_CHANGESET = 528ce55d1259
-OPENJDK_CHANGESET = 2783cace584c
+CORBA_CHANGESET = e9b200124386
+JAXP_CHANGESET = 9bd1d8e8b802
+JAXWS_CHANGESET = 9a744f20cfc5
+JDK_CHANGESET = 507eee662587
+LANGTOOLS_CHANGESET = 0cf6181d44db
+OPENJDK_CHANGESET = a3fa5d49d528
 
-CORBA_SHA256SUM = b62a90df383b8ac274ff6ec58d771cea5022ea4449c036c531204bc8c210186e
-JAXP_SHA256SUM = 277f34d590b15e4c54b97b1e2a9fac99348b3a0eed2b8e5e36327fed022f215a
-JAXWS_SHA256SUM = b6a09489abb51b8f0047b3eb6a884e1dc1df76d0f93943c76a60d3b9e6bf8885
-JDK_SHA256SUM = e2d3f6cf43140ef8cd6fef2d3ddd11a55d4e81a6c49b8c9f3aefc1213fca65e0
-LANGTOOLS_SHA256SUM = c7122411c19d764b149162ca8620fbdd2ace9ef1ffd0d3c50bd6b502c98d8d27
-OPENJDK_SHA256SUM = 541f29612e561b57aec96bb625e8c0c3981fd7c25b2f4ebf95846a3a7bbd4658
+CORBA_SHA256SUM = 07dcf05edc38ae63e4b667437cd23e5c3edbf6e03ffd7ce4b3eb24ea4c868468
+JAXP_SHA256SUM = 2bddebe957905927dde720619601ffc22d3067448e6079a2befe2ba30de99a15
+JAXWS_SHA256SUM = d8a6012bfb7217d3033b4b2c530753f336a5ea52e487f776f0399c87d7979b99
+JDK_SHA256SUM = b7a309b177f53281fba881f379619a6ce36f1f733da610af1275ed160dbe6d02
+LANGTOOLS_SHA256SUM = 9fbd9e68422aaae9b6962bb7a9400a45959bf36b5f1ea443fbbd270dda9feca1
+OPENJDK_SHA256SUM = c9c03e96be355de46f7aef23209afe2e9ff58c9bd4cf3e6fa4bebfb8f7dc89aa
 
 CACAO_VERSION = a567bcb7f589
 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
@@ -240,12 +240,7 @@
 
 # Patch list
 
-ICEDTEA_PATCHES = \
-	patches/werror-jdk.patch \
-	patches/werror-langtools.patch \
-	patches/werror-hotspot.patch \
-	patches/no_diz_files.patch \
-	patches/7192804-jvisualvm.patch
+ICEDTEA_PATCHES =
 
 # Conditional patches
 
--- a/hotspot.map	Wed Aug 29 12:17:15 2012 +0100
+++ b/hotspot.map	Wed Aug 29 19:58:08 2012 +0100
@@ -1,3 +1,3 @@
 # version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot ee0c4d11b205 b55caed300e68686bf3ce9d60c1b303125f99c281b19009e5622bc43d02eb081
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 3e0087ab5e92 3e85e236b683c14bad9505f414a0acd876956bb8e67362acd6a5bbae99bbe9e4
 zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot b41a43560dc8 25d13a4be1c343b620d2a85a47b8b654abaee3541968d205128ca69cf46fc17c
--- a/patches/7192804-jvisualvm.patch	Wed Aug 29 12:17:15 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1345732943 -3600
-# Node ID d06702bfc987d0679d0c047b0897fbe7a684a608
-# Parent  968de9a6cf662529fd0fac7b54d9f8614d338da0
-7192804: Build should not install jvisualvm man page for OpenJDK
-Summary: OpenJDK builds don't ship VisualVM so shouldn't ship its man page either.
-Reviewed-by: dholmes
-
-diff --git a/make/common/Release.gmk b/make/common/Release.gmk
---- openjdk/jdk/make/common/Release.gmk
-+++ openjdk/jdk/make/common/Release.gmk
-@@ -158,7 +158,6 @@
-         jstack.1           \
-         jstat.1            \
-         jstatd.1           \
--        jvisualvm.1        \
- 	native2ascii.1     \
- 	rmic.1             \
-         schemagen.1        \
-@@ -167,6 +166,10 @@
-         wsimport.1         \
-         xjc.1
- 
-+ifndef OPENJDK
-+  JDK_MAN_PAGES += jvisualvm.1
-+endif
-+
- ifeq ($(PLATFORM), solaris)
-   MANBASEDIRS=$(JDK_TOPDIR)/src/solaris/doc $(IMPORTDOCDIR)
-   MAN1SUBDIR=sun/man/man1
--- a/patches/no_diz_files.patch	Wed Aug 29 12:17:15 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-diff --git a/make/common/Library.gmk b/make/common/Library.gmk
---- openjdk/jdk/make/common/Library.gmk
-+++ openjdk/jdk/make/common/Library.gmk
-@@ -269,6 +269,7 @@
-   ifneq ($(PLATFORM), macosx)
-     ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-       ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
-+      ifneq ($(STRIP_POLICY),no_strip)
-         ifeq ($(PLATFORM), solaris)
- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-@@ -279,19 +280,20 @@
- #
- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
--	(set -e ; \
--	 $(CD) $(@D) ; \
--	 $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \
--	 $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
--         $(ADD_GNU_DEBUGLINK) $(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \
--	)
-+	  (set -e ; \
-+	   $(CD) $(@D) ; \
-+	   $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \
-+	   $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
-+           $(ADD_GNU_DEBUGLINK) $(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \
-+	  )
-         else # PLATFORM != solaris
--	(set -e ; \
--	 $(CD) $(@D) ; \
--	 $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
--	 $(OBJCOPY) --add-gnu-debuglink=$(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \
--	)
--        endif # PLATFORM == solaris
-+	  (set -e ; \
-+	   $(CD) $(@D) ; \
-+	   $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
-+	   $(OBJCOPY) --add-gnu-debuglink=$(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \
-+	  )
-+          endif # PLATFORM == solaris
-+        endif # STRIP_POLICY != no_strip
-         ifeq ($(STRIP_POLICY),all_strip)
- 	  $(STRIP) $@
-         else
-@@ -305,12 +307,14 @@
-           # implied else here is no stripping at all
-           endif
-         endif
--        ifeq ($(ZIP_DEBUGINFO_FILES),1)
--	  (set -e ; \
--	   $(CD) $(@D) ; \
--	   $(ZIPEXE) -q $(LIB_PREFIX)$(LIBRARY).diz $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
--	   $(RM) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
--	  )
-+        ifneq ($(STRIP_POLICY),no_strip)
-+          ifeq ($(ZIP_DEBUGINFO_FILES),1)
-+	    (set -e ; \
-+	     $(CD) $(@D) ; \
-+	     $(ZIPEXE) -q $(LIB_PREFIX)$(LIBRARY).diz $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
-+	     $(RM) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
-+	    )
-+          endif
-         endif
-       endif # LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
-     endif # ENABLE_FULL_DEBUG_SYMBOLS
-diff --git a/make/common/Program.gmk b/make/common/Program.gmk
---- openjdk/jdk/make/common/Program.gmk
-+++ openjdk/jdk/make/common/Program.gmk
-@@ -276,7 +276,8 @@
-   ifneq ($(PLATFORM), macosx)
-     ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-       ifeq ($(PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
--        ifeq ($(PLATFORM), solaris)
-+        ifneq ($(STRIP_POLICY),no_strip)
-+          ifeq ($(PLATFORM), solaris)
- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
- # empty section headers until a fixed $(OBJCOPY) is available.
-@@ -286,19 +287,20 @@
- #
- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
--	(set -e ; \
--	 $(CD) $(@D) ; \
--	 $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \
--	 $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \
--         $(ADD_GNU_DEBUGLINK) $(@F).debuginfo $(@F) ; \
--	)
--        else # PLATFORM != solaris
--	(set -e ; \
--	 $(CD) $(@D) ; \
--	 $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \
--	 $(OBJCOPY) --add-gnu-debuglink=$(@F).debuginfo $(@F) ; \
--	)
--        endif # PLATFORM == solaris
-+	  (set -e ; \
-+	   $(CD) $(@D) ; \
-+	   $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \
-+	   $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \
-+           $(ADD_GNU_DEBUGLINK) $(@F).debuginfo $(@F) ; \
-+	  )
-+          else # PLATFORM != solaris
-+	  (set -e ; \
-+	   $(CD) $(@D) ; \
-+	   $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \
-+	   $(OBJCOPY) --add-gnu-debuglink=$(@F).debuginfo $(@F) ; \
-+	  )
-+          endif # PLATFORM == solaris
-+        endif
-         ifeq ($(STRIP_POLICY),all_strip)
- 	  $(STRIP) $@
-         else
-@@ -312,17 +314,19 @@
-           # implied else here is no stripping at all
-           endif
-         endif
--        ifeq ($(ZIP_DEBUGINFO_FILES),1)
--	  (set -e ; \
--	   $(CD) $(@D) ; \
--	   $(ZIPEXE) -q $(@F).diz $(@F).debuginfo ; \
--	   $(RM) $(@F).debuginfo ; \
--	  )
--          # save ZIP'ed debug info with rest of the program's build artifacts
--	  $(MV) $@.diz $(OBJDIR)
--        else
--          # save debug info with rest of the program's build artifacts
--	  $(MV) $@.debuginfo $(OBJDIR)
-+        ifneq ($(STRIP_POLICY),no_strip)
-+          ifeq ($(ZIP_DEBUGINFO_FILES),1)
-+	    (set -e ; \
-+	     $(CD) $(@D) ; \
-+	     $(ZIPEXE) -q $(@F).diz $(@F).debuginfo ; \
-+	     $(RM) $(@F).debuginfo ; \
-+	    )
-+            # save ZIP'ed debug info with rest of the program's build artifacts
-+	    $(MV) $@.diz $(OBJDIR)
-+          else
-+            # save debug info with rest of the program's build artifacts
-+	    $(MV) $@.debuginfo $(OBJDIR)
-+          endif
-         endif
-       endif # PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS
-     endif # ENABLE_FULL_DEBUG_SYMBOLS
--- a/patches/werror-hotspot.patch	Wed Aug 29 12:17:15 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-diff --git a/make/linux/makefiles/adlc.make b/make/linux/makefiles/adlc.make
---- openjdk/hotspot/make/linux/makefiles/adlc.make
-+++ openjdk/hotspot/make/linux/makefiles/adlc.make
-@@ -68,7 +68,9 @@
- 
- # CFLAGS_WARN holds compiler options to suppress/enable warnings.
- # Compiler warnings are treated as errors
-+ifneq ($(COMPILER_WARNINGS_FATAL),false)
- CFLAGS_WARN = -Werror
-+endif
- CFLAGS += $(CFLAGS_WARN)
- 
- OBJECTNAMES = \
-diff --git a/make/linux/makefiles/gcc.make b/make/linux/makefiles/gcc.make
---- openjdk/hotspot/make/linux/makefiles/gcc.make
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make
-@@ -150,7 +150,9 @@
- endif
- 
- # Compiler warnings are treated as errors
-+ifneq ($(COMPILER_WARNINGS_FATAL),false)
- WARNINGS_ARE_ERRORS = -Werror
-+endif
- 
- # Except for a few acceptable ones
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
-diff --git a/make/solaris/makefiles/adlc.make b/make/solaris/makefiles/adlc.make
---- openjdk/hotspot/make/solaris/makefiles/adlc.make
-+++ openjdk/hotspot/make/solaris/makefiles/adlc.make
-@@ -75,8 +75,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 --git a/make/solaris/makefiles/gcc.make b/make/solaris/makefiles/gcc.make
---- openjdk/hotspot/make/solaris/makefiles/gcc.make
-+++ openjdk/hotspot/make/solaris/makefiles/gcc.make
-@@ -112,7 +112,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
- ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare 
- CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS) 
--- a/patches/werror-jdk.patch	Wed Aug 29 12:17:15 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-diff --git a/make/com/sun/nio/sctp/Makefile b/make/com/sun/nio/sctp/Makefile
---- openjdk/jdk/make/com/sun/nio/sctp/Makefile
-+++ openjdk/jdk/make/com/sun/nio/sctp/Makefile
-@@ -60,7 +60,6 @@
-   -I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders
- 
- ifeq ($(PLATFORM), linux)
--COMPILER_WARNINGS_FATAL=true
- #OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
- OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl
- endif
-diff --git a/make/java/nio/Makefile b/make/java/nio/Makefile
---- openjdk/jdk/make/java/nio/Makefile
-+++ openjdk/jdk/make/java/nio/Makefile
-@@ -31,7 +31,7 @@
- PACKAGE = java.nio
- LIBRARY = nio
- PRODUCT = java
--OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
-+OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial
- include $(BUILDDIR)/common/Defs.gmk
- 
- NIO_SRC = $(SHARE_SRC)/classes/java/nio
-diff --git a/make/java/sun_nio/Makefile b/make/java/sun_nio/Makefile
---- openjdk/jdk/make/java/sun_nio/Makefile
-+++ openjdk/jdk/make/java/sun_nio/Makefile
-@@ -31,7 +31,7 @@
- PACKAGE = sun.nio
- PRODUCT = sun
- 
--OTHER_JAVACFLAGS += -Xlint:serial,-deprecation -Werror
-+OTHER_JAVACFLAGS += -Xlint:serial,-deprecation
- include $(BUILDDIR)/common/Defs.gmk
- 
- #
-diff --git a/make/sun/native2ascii/Makefile b/make/sun/native2ascii/Makefile
---- openjdk/jdk/make/sun/native2ascii/Makefile
-+++ openjdk/jdk/make/sun/native2ascii/Makefile
-@@ -30,7 +30,7 @@
- BUILDDIR = ../..
- PACKAGE = sun.tools.native2ascii
- PRODUCT = sun
--OTHER_JAVACFLAGS += -Xlint:serial -Werror
-+OTHER_JAVACFLAGS += -Xlint:serial
- include $(BUILDDIR)/common/Defs.gmk
- 
- # This program must contain a manifest that defines the execution level
-diff --git a/make/sun/nio/cs/Makefile b/make/sun/nio/cs/Makefile
---- openjdk/jdk/make/sun/nio/cs/Makefile
-+++ openjdk/jdk/make/sun/nio/cs/Makefile
-@@ -36,7 +36,7 @@
- # This re-directs all the class files to a separate location
- CLASSDESTDIR = $(TEMPDIR)/classes
- 
--OTHER_JAVACFLAGS += -Xlint:serial,-deprecation -Werror
-+OTHER_JAVACFLAGS += -Xlint:serial,-deprecation
- include $(BUILDDIR)/common/Defs.gmk
- 
- #
-diff --git a/make/tools/Makefile b/make/tools/Makefile
---- openjdk/jdk/make/tools/Makefile
-+++ openjdk/jdk/make/tools/Makefile
-@@ -29,7 +29,14 @@
- 
- BUILDDIR = ..
- 
--SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true JAVAC_WARNINGS_FATAL=true
-+ifndef JAVAC_MAX_WARNINGS
-+  SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true
-+endif
-+
-+ifndef JAVAC_WARNINGS_FATAL
-+  SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
-+endif
-+
- include $(BUILDDIR)/common/Defs.gmk
- 
- # Note: freetypecheck is built by Sanity.gmk if needed
--- a/patches/werror-langtools.patch	Wed Aug 29 12:17:15 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-diff --git a/make/Makefile b/make/Makefile
---- openjdk/langtools/make/Makefile
-+++ openjdk/langtools/make/Makefile
-@@ -111,6 +111,12 @@
-   ANT_OPTIONS += -Ddebug.classfiles=true
- endif
- 
-+ifeq ($(JAVAC_WARNINGS_FATAL), true)
-+  ANT_OPTIONS += -Dwarnings.fatal=-Werror
-+else
-+  ANT_OPTIONS += -Dwarnings.fatal=
-+endif
-+
- # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
- # and the somewhat misnamed CLASS_VERSION (-target NN)
- ifdef TARGET_CLASS_VERSION
-diff --git a/make/build.properties b/make/build.properties
---- openjdk/langtools/make/build.properties
-+++ openjdk/langtools/make/build.properties
-@@ -68,7 +68,7 @@
- # set the following to -version to verify the versions of javac being used
- javac.version.opt =
- # in time, there should be no exceptions to -Xlint:all
--javac.lint.opts = -Xlint:all,-deprecation -Werror
-+javac.lint.opts = -Xlint:all,-deprecation ${warnings.fatal}
- 
- # options for the <javadoc> task for javac
- #javadoc.jls3.url=http://java.sun.com/docs/books/jls/