# HG changeset patch
# User ihse
# Date 1511513139 -3600
# Node ID 19122c10fc5285863014432f75790c2a74ef439f
# Parent  0c22f6b9b5e2cbc0cb40cc4083e10c386efe7ca2
8191205: Set native-debug-symbols default to "external"
Reviewed-by: ehelin, erikj

diff -r 0c22f6b9b5e2 -r 19122c10fc52 make/Bundles.gmk
--- a/make/Bundles.gmk	Fri Nov 24 09:21:38 2017 +0100
+++ b/make/Bundles.gmk	Fri Nov 24 09:45:39 2017 +0100
@@ -177,7 +177,7 @@
   # Create special filter rules when dealing with unzipped .dSYM directories on
   # macosx
   ifeq ($(OPENJDK_TARGET_OS), macosx)
-    ifeq ($(ZIP_DEBUGINFO_FILES), false)
+    ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
       JDK_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
           $(call containing, .dSYM/, $(patsubst $(JDK_IMAGE_DIR)/%, %, $(ALL_JDK_FILES))))
     endif
@@ -212,7 +212,7 @@
   # Create special filter rules when dealing with unzipped .dSYM directories on
   # macosx
   ifeq ($(OPENJDK_TARGET_OS), macosx)
-    ifeq ($(ZIP_DEBUGINFO_FILES), false)
+    ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
       JRE_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
           $(call containing, .dSYM/, $(patsubst $(JRE_IMAGE_DIR)/%, %, $(ALL_JRE_FILES))))
     endif
diff -r 0c22f6b9b5e2 -r 19122c10fc52 make/autoconf/generated-configure.sh
--- a/make/autoconf/generated-configure.sh	Fri Nov 24 09:21:38 2017 +0100
+++ b/make/autoconf/generated-configure.sh	Fri Nov 24 09:45:39 2017 +0100
@@ -5155,7 +5155,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1511254554
+DATE_WHEN_GENERATED=1511359342
 
 ###############################################################################
 #
@@ -54080,13 +54080,13 @@
 else
 
         if test "x$OPENJDK_TARGET_OS" = xaix; then
-          # AIX doesn't support 'zipped' so use 'internal' as default
+          # AIX doesn't support 'external' so use 'internal' as default
           with_native_debug_symbols="internal"
         else
           if test "x$STATIC_BUILD" = xtrue; then
             with_native_debug_symbols="none"
           else
-            with_native_debug_symbols="zipped"
+            with_native_debug_symbols="external"
           fi
         fi
 
diff -r 0c22f6b9b5e2 -r 19122c10fc52 make/autoconf/jdk-options.m4
--- a/make/autoconf/jdk-options.m4	Fri Nov 24 09:21:38 2017 +0100
+++ b/make/autoconf/jdk-options.m4	Fri Nov 24 09:45:39 2017 +0100
@@ -296,13 +296,13 @@
       ],
       [
         if test "x$OPENJDK_TARGET_OS" = xaix; then
-          # AIX doesn't support 'zipped' so use 'internal' as default
+          # AIX doesn't support 'external' so use 'internal' as default
           with_native_debug_symbols="internal"
         else
           if test "x$STATIC_BUILD" = xtrue; then
             with_native_debug_symbols="none"
           else
-            with_native_debug_symbols="zipped"
+            with_native_debug_symbols="external"
           fi
         fi
       ])