common/autoconf/generated-configure.sh

rev 977 : JDK-8019470: Changes needed to compile JDK8 on MacOS with clang compiler
Reviewed-by:

*** 4218,4228 ****
  # 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=1393327380
  
  ###############################################################################
  #
  # Initialization / Boot-strapping
  #
--- 4218,4228 ----
  # 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=1393396458
  
  ###############################################################################
  #
  # Initialization / Boot-strapping
  #
*** 26284,26295 ****
--- 26284,26315 ----
  
  
    # Use indirect variable referencing
    toolchain_var_name=VALID_TOOLCHAINS_$OPENJDK_BUILD_OS
    VALID_TOOLCHAINS=${!toolchain_var_name}
+ 
+   if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+     # On Mac OS X, default toolchain to clang after Xcode 5
+     XCODE_VERSION_OUTPUT=`xcodebuild -version 2>&1 | $HEAD -n 1`
+     $ECHO "$XCODE_VERSION_OUTPUT" | $GREP "Xcode " > /dev/null
+     if test $? -ne 0; then
+       as_fn_error $? "Failed to determine Xcode version." "$LINENO" 5
+     fi
+     XCODE_MAJOR_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | \
+         $SED -e 's/^Xcode \([1-9][0-9.]*\)/\1/' | \
+         $CUT -f 1 -d .`
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Xcode major version: $XCODE_MAJOR_VERSION" >&5
+ $as_echo "$as_me: Xcode major version: $XCODE_MAJOR_VERSION" >&6;}
+     if test $XCODE_MAJOR_VERSION -ge 5; then
+         DEFAULT_TOOLCHAIN="clang"
+     else
+         DEFAULT_TOOLCHAIN="gcc"
+     fi
+   else
      # First toolchain type in the list is the default
      DEFAULT_TOOLCHAIN=${VALID_TOOLCHAINS%% *}
+   fi
  
    if test "x$with_toolchain_type" = xlist; then
      # List all toolchains
      { $as_echo "$as_me:${as_lineno-$LINENO}: The following toolchains are valid on this platform:" >&5
  $as_echo "$as_me: The following toolchains are valid on this platform:" >&6;}
*** 41223,41232 ****
--- 41243,41272 ----
        SET_EXECUTABLE_ORIGIN='-Xlinker -rpath -Xlinker \$$$$ORIGIN$1'
        SET_SHARED_LIBRARY_ORIGIN="-Xlinker -z -Xlinker origin $SET_EXECUTABLE_ORIGIN"
        SET_SHARED_LIBRARY_NAME='-Xlinker -soname=$1'
        SET_SHARED_LIBRARY_MAPFILE='-Xlinker -version-script=$1'
      fi
+   elif test "x$TOOLCHAIN_TYPE" = xclang; then
+     PICFLAG=''
+     C_FLAG_REORDER=''
+     CXX_FLAG_REORDER=''
+ 
+     if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+       # Linking is different on MacOSX
+       SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG"
+       SET_EXECUTABLE_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
+       SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
+       SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1'
+       SET_SHARED_LIBRARY_MAPFILE=''
+     else
+       # Default works for linux, might work on other platforms as well.
+       SHARED_LIBRARY_FLAGS='-shared'
+       SET_EXECUTABLE_ORIGIN='-Xlinker -rpath -Xlinker \$$$$ORIGIN$1'
+       SET_SHARED_LIBRARY_ORIGIN="-Xlinker -z -Xlinker origin $SET_EXECUTABLE_ORIGIN"
+       SET_SHARED_LIBRARY_NAME='-Xlinker -soname=$1'
+       SET_SHARED_LIBRARY_MAPFILE='-Xlinker -version-script=$1'
+     fi
    elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
      PICFLAG="-KPIC"
      C_FLAG_REORDER='-xF'
      CXX_FLAG_REORDER='-xF'
      SHARED_LIBRARY_FLAGS="-G"
*** 41284,41293 ****
--- 41324,41335 ----
    # fi
  
    # Generate make dependency files
    if test "x$TOOLCHAIN_TYPE" = xgcc; then
      C_FLAG_DEPS="-MMD -MF"
+   elif test "x$TOOLCHAIN_TYPE" = xclang; then
+     C_FLAG_DEPS="-MMD -MF"
    elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
      C_FLAG_DEPS="-xMMD -xMF"
    elif test "x$TOOLCHAIN_TYPE" = xxlc; then
      C_FLAG_DEPS="-qmakedep=gcc -MF"
    fi
*** 41302,41311 ****
--- 41344,41356 ----
        CXXFLAGS_DEBUG_SYMBOLS="-g1"
      else
        CFLAGS_DEBUG_SYMBOLS="-g"
        CXXFLAGS_DEBUG_SYMBOLS="-g"
      fi
+   elif test "x$TOOLCHAIN_TYPE" = xclang; then
+     CFLAGS_DEBUG_SYMBOLS="-g"
+     CXXFLAGS_DEBUG_SYMBOLS="-g"
    elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
      CFLAGS_DEBUG_SYMBOLS="-g -xs"
      CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs"
    elif test "x$TOOLCHAIN_TYPE" = xxlc; then
      CFLAGS_DEBUG_SYMBOLS="-g"
*** 41349,41358 ****
--- 41394,41417 ----
        if test "x$OPENJDK_TARGET_OS" = xmacosx; then
          # On MacOSX we optimize for size, something
          # we should do for all platforms?
          C_O_FLAG_HIGHEST="-Os"
          C_O_FLAG_HI="-Os"
+         C_O_FLAG_NORM="-Os"
+         C_O_FLAG_NONE=""
+       else
+         C_O_FLAG_HIGHEST="-O3"
+         C_O_FLAG_HI="-O3"
+         C_O_FLAG_NORM="-O2"
+         C_O_FLAG_NONE="-O0"
+       fi
+     elif test "x$TOOLCHAIN_TYPE" = xclang; then
+       if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+         # On MacOSX we optimize for size, something
+         # we should do for all platforms?
+         C_O_FLAG_HIGHEST="-Os"
+         C_O_FLAG_HI="-Os"
          C_O_FLAG_NORM="-Os"
          C_O_FLAG_NONE=""
        else
          C_O_FLAG_HIGHEST="-O3"
          C_O_FLAG_HI="-O3"