# HG changeset patch
# User duke
# Date 1499273730 -7200
# Node ID 384a2cead72ee9dd97b57131d0d83aaf31de6461
# Parent  7083a5fec809d1a2dacd85e16498bb34cf913e53# Parent  46c3a4b9ef6d103bfaccb10aa10864545888ca12
Merge

diff -r 7083a5fec809 -r 384a2cead72e .hgtags-top-repo
--- a/.hgtags-top-repo	Fri May 17 08:59:19 2013 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 18:55:30 2017 +0200
@@ -211,3 +211,4 @@
 b9415faa7066a4d3b16d466556d5428446918d95 jdk8-b87
 e1a929afcfc492470d50be0b6b0e8dc77d3760b9 jdk8-b88
 892a0196d10c67f3a12f0eefb0bb536e423d8868 jdk8-b89
+69b773a221b956a3386933ecdbfeccee0edeac47 jdk8-b90
diff -r 7083a5fec809 -r 384a2cead72e NewMakefile.gmk
--- a/NewMakefile.gmk	Fri May 17 08:59:19 2013 -0700
+++ b/NewMakefile.gmk	Wed Jul 05 18:55:30 2017 +0200
@@ -73,7 +73,7 @@
             grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
 
 $(all_phony_targets):
-	@$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) $(VERBOSE) VERBOSE=$(VERBOSE) $@) &&) true
+	@$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
 
     endif
 endif
diff -r 7083a5fec809 -r 384a2cead72e common/autoconf/spec.gmk.in
--- a/common/autoconf/spec.gmk.in	Fri May 17 08:59:19 2013 -0700
+++ b/common/autoconf/spec.gmk.in	Wed Jul 05 18:55:30 2017 +0200
@@ -54,9 +54,9 @@
 
 MAKE:=@MAKE@
 
-# Pass along the verbosity setting.
+# Pass along the verbosity and log level settings.
 ifeq (,$(findstring VERBOSE=,$(MAKE)))
-    MAKE:=$(MAKE) $(VERBOSE) VERBOSE="$(VERBOSE)"
+    MAKE:=$(MAKE) $(VERBOSE) VERBOSE="$(VERBOSE)" LOG_LEVEL="$(LOG_LEVEL)"
 endif
 
 # No implicit variables or rules!
diff -r 7083a5fec809 -r 384a2cead72e common/makefiles/Main.gmk
--- a/common/makefiles/Main.gmk	Fri May 17 08:59:19 2013 -0700
+++ b/common/makefiles/Main.gmk	Wed Jul 05 18:55:30 2017 +0200
@@ -240,10 +240,10 @@
 clean-test:
 	$(call CleanComponent,testoutput)
 
-.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install
-.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only
-.PHONY: all test clean dist-clean bootcycle-images start-make
-.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build
+.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
+.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
+.PHONY: all clean dist-clean bootcycle-images start-make
+.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build
 .PHONY: profiles profiles-only profiles-oscheck
 
 FRC: # Force target
diff -r 7083a5fec809 -r 384a2cead72e common/makefiles/NativeCompilation.gmk
--- a/common/makefiles/NativeCompilation.gmk	Fri May 17 08:59:19 2013 -0700
+++ b/common/makefiles/NativeCompilation.gmk	Wed Jul 05 18:55:30 2017 +0200
@@ -321,11 +321,17 @@
 
     ifneq (,$$($1_DEBUG_SYMBOLS))	
         ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
-            # Programs don't get the debug symbols added in the old build. It's not clear if
-            # this is intentional.
-            ifeq ($$($1_PROGRAM),)
+	    ifdef OPENJDK
+	        # Always add debug symbols
                 $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
                 $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
+	    else
+                # Programs don't get the debug symbols added in the old build. It's not clear if
+                # this is intentional.
+                ifeq ($$($1_PROGRAM),)
+                    $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
+                    $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
+                endif
             endif
         endif
     endif