# HG changeset patch
# User lana
# Date 1398380615 25200
# Node ID b9666074e6dbc8b218b0cdddbb5c736cd67c5d07
# Parent  a8cbc54cc078a38954fb088ed9a8409d62d6f8b4# Parent  1fc636fbd7cf86f7254755ae1e1321a0cf754b49
Merge

diff -r a8cbc54cc078 -r b9666074e6db jaxp/make/BuildJaxp.gmk
--- a/jaxp/make/BuildJaxp.gmk	Thu Apr 24 12:21:08 2014 -0700
+++ b/jaxp/make/BuildJaxp.gmk	Thu Apr 24 16:03:35 2014 -0700
@@ -35,15 +35,15 @@
 # The generate new bytecode uses the new compiler for to generate bytecode
 # for the new jdk that is being built. The code compiled by this setup
 # cannot necessarily be run with the boot jdk.
-$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG, \
+$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE, \
     JVM := $(JAVA), \
     JAVAC := $(NEW_JAVAC), \
-    FLAGS := -XDignore.symbol.file=true $(DISABLE_JAXP_WARNINGS) -g, \
+    FLAGS := -XDignore.symbol.file=true $(DISABLE_JAXP_WARNINGS), \
     SERVER_DIR := $(SJAVAC_SERVER_DIR), \
     SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
 
 $(eval $(call SetupJavaCompilation,BUILD_JAXP, \
-    SETUP := GENERATE_NEWBYTECODE_DEBUG, \
+    SETUP := GENERATE_NEWBYTECODE, \
     SRC := $(JAXP_TOPDIR)/src, \
     CLEAN := .properties, \
     BIN := $(JAXP_OUTPUTDIR)/classes, \