< prev index next >

common/autoconf/generated-configure.sh

Print this page

        

@@ -686,12 +686,16 @@
 LIBCXX
 STATIC_CXX_SETTING
 FIXPATH_DETACH_FLAG
 FIXPATH
 GCOV_ENABLED
+JAVA_DEBUG_SYMBOLS
 ZIP_DEBUGINFO_FILES
 ENABLE_DEBUG_SYMBOLS
+STRIP_POLICY
+DEBUG_BINARIES
+NATIVE_DEBUG_SYMBOLS
 CFLAGS_WARNINGS_ARE_ERRORS
 DISABLE_WARNING_PREFIX
 HOTSPOT_SET_WARNINGS_AS_ERRORS
 WARNINGS_AS_ERRORS
 COMPILER_SUPPORTS_TARGET_BITS_FLAG

@@ -1092,10 +1096,12 @@
 with_extra_ldflags
 with_toolchain_version
 with_build_devkit
 with_jtreg
 enable_warnings_as_errors
+with_native_debug_symbols
+enable_java_debug_symbols
 enable_debug_symbols
 enable_zip_debug_info
 enable_native_coverage
 with_stdc__lib
 with_msvcr_dll

@@ -1872,13 +1878,17 @@
                           Enable unlimited crypto policy [disabled]
   --enable-static-build   enable static library build [disabled]
   --disable-warnings-as-errors
                           do not consider native warnings to be an error
                           [enabled]
-  --disable-debug-symbols disable generation of debug symbols [enabled]
-  --disable-zip-debug-info
-                          disable zipping of debug-info files [enabled]
+  --enable-java-debug-symbols
+                          enable generating debug symbols in java class files
+                          [disabled]
+  --enable-debug-symbols  Deprecated. Option is kept for backwards
+                          compatibility and is ignored
+  --enable-zip-debug-info Deprecated. Option is kept for backwards
+                          compatibility and is ignored
   --enable-native-coverage
                           enable native compilation with code coverage
                           data[disabled]
   --disable-freetype-bundling
                           disable bundling of the freetype library with the

@@ -1966,10 +1976,13 @@
                           the version of the toolchain to look for, use
                           '--help' to show possible values [platform
                           dependent]
   --with-build-devkit     Devkit to use for the build platform toolchain
   --with-jtreg            Regression Test Harness [probed]
+  --with-native-debug-symbols
+                          set the native debug symbol configuration (none,
+                          internal, external, zipped) [zipped]
   --with-stdc++lib=<static>,<dynamic>,<default>
                           force linking of the C++ runtime on Linux to either
                           static or dynamic, default is static with dynamic as
                           fallback
   --with-msvcr-dll        path to microsoft C runtime dll (msvcr*.dll)

@@ -4638,11 +4651,11 @@
 # definitions. It is replaced with custom functionality when building
 # custom sources.
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1448463381
+DATE_WHEN_GENERATED=1448546432
 
 ###############################################################################
 #
 # Initialization / Boot-strapping
 #

@@ -47003,69 +47016,120 @@
 
 
 # Setup debug symbols (need objcopy from the toolchain for that)
 
   #
-  # ENABLE_DEBUG_SYMBOLS
-  # This must be done after the toolchain is setup, since we're looking at objcopy.
+  # NATIVE_DEBUG_SYMBOLS
   #
-  # Check whether --enable-debug-symbols was given.
-if test "${enable_debug_symbols+set}" = set; then :
-  enableval=$enable_debug_symbols;
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking what type of native debug symbols to use" >&5
+$as_echo_n "checking what type of native debug symbols to use... " >&6; }
+
+# Check whether --with-native-debug-symbols was given.
+if test "${with_native_debug_symbols+set}" = set; then :
+  withval=$with_native_debug_symbols;
+else
+  with_native_debug_symbols="zipped"
 fi
 
+  NATIVE_DEBUG_SYMBOLS=$with_native_debug_symbols
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NATIVE_DEBUG_SYMBOLS" >&5
+$as_echo "$NATIVE_DEBUG_SYMBOLS" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should generate debug symbols" >&5
-$as_echo_n "checking if we should generate debug symbols... " >&6; }
+  if test "x$NATIVE_DEBUG_SYMBOLS" = xzipped; then
 
-  if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then
+    if test "x$OBJCOPY" = x; then
     # explicit enabling of enable-debug-symbols and can't find objcopy
     #   this is an error
     as_fn_error $? "Unable to find objcopy, cannot enable debug-symbols" "$LINENO" 5
   fi
 
-  if test "x$enable_debug_symbols" = "xyes"; then
     ENABLE_DEBUG_SYMBOLS=true
-  elif test "x$enable_debug_symbols" = "xno"; then
+    ZIP_DEBUGINFO_FILES=true
+    DEBUG_BINARIES=true
+    STRIP_POLICY=min_strip
+  elif test "x$NATIVE_DEBUG_SYMBOLS" = xnone; then
     ENABLE_DEBUG_SYMBOLS=false
-  else
-    # Default is on if objcopy is found
-    if test "x$OBJCOPY" != x; then
-      ENABLE_DEBUG_SYMBOLS=true
-    # MacOS X and Windows don't use objcopy but default is on for those OSes
-    elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
+    ZIP_DEBUGINFO_FILES=false
+    DEBUG_BINARIES=false
+    STRIP_POLICY=min_strip
+  elif test "x$NATIVE_DEBUG_SYMBOLS" = xinternal; then
+    ENABLE_DEBUG_SYMBOLS=false  # -g option only
+    ZIP_DEBUGINFO_FILES=false
+    DEBUG_BINARIES=true
+    STRIP_POLICY=no_strip
+    STRIP=""
+  elif test "x$NATIVE_DEBUG_SYMBOLS" = xexternal; then
+
+    if test "x$OBJCOPY" = x; then
+      # explicit enabling of enable-debug-symbols and can't find objcopy
+      # this is an error
+      as_fn_error $? "Unable to find objcopy, cannot enable debug-symbols" "$LINENO" 5
+    fi
+
       ENABLE_DEBUG_SYMBOLS=true
+    ZIP_DEBUGINFO_FILES=false
+    DEBUG_BINARIES=true
+    STRIP_POLICY=min_strip
     else
-      ENABLE_DEBUG_SYMBOLS=false
-    fi
+    as_fn_error $? "Allowed native debug symbols are: none, internal, external, zipped" "$LINENO" 5
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_DEBUG_SYMBOLS" >&5
-$as_echo "$ENABLE_DEBUG_SYMBOLS" >&6; }
-
   #
-  # ZIP_DEBUGINFO_FILES
+  # JAVA_DEBUG_SYMBOLS
   #
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should zip debug-info files" >&5
-$as_echo_n "checking if we should zip debug-info files... " >&6; }
-  # Check whether --enable-zip-debug-info was given.
-if test "${enable_zip_debug_info+set}" = set; then :
-  enableval=$enable_zip_debug_info; enable_zip_debug_info="${enableval}"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should generate debug symbols in class files" >&5
+$as_echo_n "checking if we should generate debug symbols in class files... " >&6; }
+  # Check whether --enable-java-debug-symbols was given.
+if test "${enable_java_debug_symbols+set}" = set; then :
+  enableval=$enable_java_debug_symbols; enable_java_debug_symbols="${enableval}"
 else
-  enable_zip_debug_info="yes"
+  enable_java_debug_symbols="no"
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_zip_debug_info}" >&5
-$as_echo "${enable_zip_debug_info}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_java_debug_symbols}" >&5
+$as_echo "${enable_java_debug_symbols}" >&6; }
 
-  if test "x${enable_zip_debug_info}" = "xno"; then
-    ZIP_DEBUGINFO_FILES=false
+  if test "x${enable_java_debug_symbols}" = "xyes"; then
+    JAVA_DEBUG_SYMBOLS=true
+    JAVAC_FLAGS="$JAVAC_FLAGS -g"
   else
-    ZIP_DEBUGINFO_FILES=true
+    JAVA_DEBUG_SYMBOLS=false
+  fi
+
+  # --enable-debug-symbols is deprecated.
+  # Please use --with-debug-symbols=[internal,external,zipped] .
+
+  # Check whether --enable-debug-symbols was given.
+if test "${enable_debug_symbols+set}" = set; then :
+  enableval=$enable_debug_symbols;
+fi
+
+  if test "x$enable_debug_symbols" != x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --enable-debug-symbols is deprecated and will be ignored." >&5
+$as_echo "$as_me: WARNING: Option --enable-debug-symbols is deprecated and will be ignored." >&2;}
   fi
 
 
+  # --enable-zip-debug-info is deprecated.
+  # Please use --with-debug-symbols=zipped .
+
+  # Check whether --enable-zip-debug-info was given.
+if test "${enable_zip_debug_info+set}" = set; then :
+  enableval=$enable_zip_debug_info;
+fi
+
+  if test "x$enable_zip_debug_info" != x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --enable-zip-debug-info is deprecated and will be ignored." >&5
+$as_echo "$as_me: WARNING: Option --enable-zip-debug-info is deprecated and will be ignored." >&2;}
+  fi
+
+
+
+
+
+
+
 
 
 
   # Check whether --enable-native-coverage was given.
 if test "${enable_native_coverage+set}" = set; then :
< prev index next >