8207853: Need to regenerate configure in jdk8u-dev

Thu, 19 Jul 2018 10:55:43 -0700

author
erikj
date
Thu, 19 Jul 2018 10:55:43 -0700
changeset 2237
2560cb8631bf
parent 2236
19e8754f5415
child 2238
6d8d269ee313

8207853: Need to regenerate configure in jdk8u-dev
Reviewed-by: tbell

common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/generated-configure.sh	Tue Jul 17 12:55:54 2018 +0200
     1.2 +++ b/common/autoconf/generated-configure.sh	Thu Jul 19 10:55:43 2018 -0700
     1.3 @@ -669,6 +669,8 @@
     1.4  XMKMF
     1.5  FIXPATH
     1.6  ZIP_DEBUGINFO_FILES
     1.7 +DEBUG_BINARIES
     1.8 +STRIP_POLICY
     1.9  ENABLE_DEBUG_SYMBOLS
    1.10  COMPILER_SUPPORTS_TARGET_BITS_FLAG
    1.11  ZERO_ARCHFLAG
    1.12 @@ -1074,6 +1076,7 @@
    1.13  with_extra_ldflags
    1.14  enable_debug_symbols
    1.15  enable_zip_debug_info
    1.16 +with_native_debug_symbols
    1.17  enable_macosx_runtime_support
    1.18  with_x
    1.19  with_cups
    1.20 @@ -1920,6 +1923,9 @@
    1.21    --with-extra-cflags     extra flags to be used when compiling jdk c-files
    1.22    --with-extra-cxxflags   extra flags to be used when compiling jdk c++-files
    1.23    --with-extra-ldflags    extra flags to be used when linking jdk
    1.24 +  --with-native-debug-symbols
    1.25 +                          set the native debug symbol configuration (none,
    1.26 +                          internal, external, zipped) [varying]
    1.27    --with-x                use the X Window System
    1.28    --with-cups             specify prefix directory for the cups package
    1.29                            (expecting the headers under PATH/include)
    1.30 @@ -4330,7 +4336,7 @@
    1.31  #CUSTOM_AUTOCONF_INCLUDE
    1.32  
    1.33  # Do not change or remove the following line, it is needed for consistency checks:
    1.34 -DATE_WHEN_GENERATED=1529506170
    1.35 +DATE_WHEN_GENERATED=1532008852
    1.36  
    1.37  ###############################################################################
    1.38  #
    1.39 @@ -42086,6 +42092,9 @@
    1.40  
    1.41  # Setup debug symbols (need objcopy from the toolchain for that)
    1.42  
    1.43 +  # Backwards compatibility. --with-native-debug-symbols is preferred post JDK-8207234,
    1.44 +  # but if somebody does not specify it via configure, we still want to preserve old
    1.45 +  # behaviour of --disable-debug-symbols
    1.46    #
    1.47    # ENABLE_DEBUG_SYMBOLS
    1.48    # This must be done after the toolchain is setup, since we're looking at objcopy.
    1.49 @@ -42124,6 +42133,9 @@
    1.50    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_DEBUG_SYMBOLS" >&5
    1.51  $as_echo "$ENABLE_DEBUG_SYMBOLS" >&6; }
    1.52  
    1.53 +  # Backwards compatibility. --with-native-debug-symbols is preferred post JDK-8207234,
    1.54 +  # but if somebody does not specify it via configure, we still want to preserve old
    1.55 +  # behaviour of --disable-zip-debug-info.
    1.56    #
    1.57    # ZIP_DEBUGINFO_FILES
    1.58    #
    1.59 @@ -42141,10 +42153,94 @@
    1.60  
    1.61    if test "x${enable_zip_debug_info}" = "xno"; then
    1.62      ZIP_DEBUGINFO_FILES=false
    1.63 -  else
    1.64 +  elif test "x${enable_zip_debug_info}" = "xyes"; then
    1.65      ZIP_DEBUGINFO_FILES=true
    1.66    fi
    1.67  
    1.68 +  #
    1.69 +  # NATIVE_DEBUG_SYMBOLS
    1.70 +  # This must be done after the toolchain is setup, since we're looking at objcopy.
    1.71 +  # In addition, this must be done after ENABLE_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES
    1.72 +  # checking in order to preserve backwards compatibility post JDK-8207234.
    1.73 +  #
    1.74 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking what type of native debug symbols to use (this will override previous settings)" >&5
    1.75 +$as_echo_n "checking what type of native debug symbols to use (this will override previous settings)... " >&6; }
    1.76 +
    1.77 +# Check whether --with-native-debug-symbols was given.
    1.78 +if test "${with_native_debug_symbols+set}" = set; then :
    1.79 +  withval=$with_native_debug_symbols;
    1.80 +        if test "x$OPENJDK_TARGET_OS" = xaix; then
    1.81 +          if test "x$with_native_debug_symbols" = xexternal || test "x$with_native_debug_symbols" = xzipped; then
    1.82 +            as_fn_error $? "AIX only supports the parameters 'none' and 'internal' for --with-native-debug-symbols" "$LINENO" 5
    1.83 +          fi
    1.84 +        fi
    1.85 +
    1.86 +else
    1.87 +
    1.88 +        # Default to unset for backwards compatibility
    1.89 +        with_native_debug_symbols=""
    1.90 +
    1.91 +fi
    1.92 +
    1.93 +  NATIVE_DEBUG_SYMBOLS=$with_native_debug_symbols
    1.94 +  if test "x$NATIVE_DEBUG_SYMBOLS" = x; then
    1.95 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not specified" >&5
    1.96 +$as_echo "not specified" >&6; }
    1.97 +  else
    1.98 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NATIVE_DEBUG_SYMBOLS" >&5
    1.99 +$as_echo "$NATIVE_DEBUG_SYMBOLS" >&6; }
   1.100 +  fi
   1.101 +  # Default is empty
   1.102 +  DEBUG_BINARIES=
   1.103 +  # Default is min_strip. Possible values are min_strip, all_strip, no_strip
   1.104 +  STRIP_POLICY=min_strip
   1.105 +
   1.106 +  if test "x$NATIVE_DEBUG_SYMBOLS" = xzipped; then
   1.107 +
   1.108 +    if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
   1.109 +      if test "x$OBJCOPY" = x; then
   1.110 +        # enabling of enable-debug-symbols and can't find objcopy
   1.111 +        # this is an error
   1.112 +        as_fn_error $? "Unable to find objcopy, cannot enable native debug symbols" "$LINENO" 5
   1.113 +      fi
   1.114 +    fi
   1.115 +
   1.116 +    ENABLE_DEBUG_SYMBOLS=true
   1.117 +    STRIP_POLICY=min_strip
   1.118 +    ZIP_DEBUGINFO_FILES=true
   1.119 +  elif test "x$NATIVE_DEBUG_SYMBOLS" = xnone; then
   1.120 +    ENABLE_DEBUG_SYMBOLS=false
   1.121 +    STRIP_POLICY=min_strip
   1.122 +    ZIP_DEBUGINFO_FILES=false
   1.123 +  elif test "x$NATIVE_DEBUG_SYMBOLS" = xinternal; then
   1.124 +    ENABLE_DEBUG_SYMBOLS=true
   1.125 +    STRIP_POLICY=no_strip
   1.126 +    ZIP_DEBUGINFO_FILES=false
   1.127 +    POST_STRIP_CMD=
   1.128 +    DEBUG_BINARIES=true
   1.129 +  elif test "x$NATIVE_DEBUG_SYMBOLS" = xexternal; then
   1.130 +
   1.131 +    if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
   1.132 +      if test "x$OBJCOPY" = x; then
   1.133 +        # enabling of enable-debug-symbols and can't find objcopy
   1.134 +        # this is an error
   1.135 +        as_fn_error $? "Unable to find objcopy, cannot enable native debug symbols" "$LINENO" 5
   1.136 +      fi
   1.137 +    fi
   1.138 +
   1.139 +    ENABLE_DEBUG_SYMBOLS=true
   1.140 +    STRIP_POLICY=min_strip
   1.141 +    ZIP_DEBUGINFO_FILES=false
   1.142 +  elif test "x$NATIVE_DEBUG_SYMBOLS" != x; then
   1.143 +    as_fn_error $? "Allowed native debug symbols are: none, internal, external, zipped" "$LINENO" 5
   1.144 +  else
   1.145 +    { $as_echo "$as_me:${as_lineno-$LINENO}: --with-native-debug-symbols not specified. Using values from --disable-debug-symbols and --disable-zip-debug-info" >&5
   1.146 +$as_echo "$as_me: --with-native-debug-symbols not specified. Using values from --disable-debug-symbols and --disable-zip-debug-info" >&6;}
   1.147 +  fi
   1.148 +
   1.149 +
   1.150 +
   1.151 +
   1.152  
   1.153  
   1.154  

mercurial