< prev index next >
common/autoconf/generated-configure.sh
Print this page
@ rev 2556 : [mq]: libc
|
*** 970,980 ****
USERNAME
CANONICAL_TOPDIR
ORIGINAL_TOPDIR
TOPDIR
PATH_SEP
! HOTSPOT_BUILD_CLIB
HOTSPOT_BUILD_CPU_DEFINE
HOTSPOT_BUILD_CPU_ARCH
HOTSPOT_BUILD_CPU
HOTSPOT_BUILD_OS_TYPE
HOTSPOT_BUILD_OS
--- 970,980 ----
USERNAME
CANONICAL_TOPDIR
ORIGINAL_TOPDIR
TOPDIR
PATH_SEP
! HOTSPOT_BUILD_LIBC
HOTSPOT_BUILD_CPU_DEFINE
HOTSPOT_BUILD_CPU_ARCH
HOTSPOT_BUILD_CPU
HOTSPOT_BUILD_OS_TYPE
HOTSPOT_BUILD_OS
*** 982,992 ****
OPENJDK_BUILD_OS_EXPORT_DIR
OPENJDK_BUILD_CPU_OSARCH
OPENJDK_BUILD_CPU_ISADIR
OPENJDK_BUILD_CPU_LEGACY_LIB
OPENJDK_BUILD_CPU_LEGACY
! HOTSPOT_TARGET_CLIB
HOTSPOT_TARGET_CPU_DEFINE
HOTSPOT_TARGET_CPU_ARCH
HOTSPOT_TARGET_CPU
HOTSPOT_TARGET_OS_TYPE
HOTSPOT_TARGET_OS
--- 982,992 ----
OPENJDK_BUILD_OS_EXPORT_DIR
OPENJDK_BUILD_CPU_OSARCH
OPENJDK_BUILD_CPU_ISADIR
OPENJDK_BUILD_CPU_LEGACY_LIB
OPENJDK_BUILD_CPU_LEGACY
! HOTSPOT_TARGET_LIBC
HOTSPOT_TARGET_CPU_DEFINE
HOTSPOT_TARGET_CPU_ARCH
HOTSPOT_TARGET_CPU
HOTSPOT_TARGET_OS_TYPE
HOTSPOT_TARGET_OS
*** 999,1017 ****
OPENJDK_TARGET_CPU_LEGACY
REQUIRED_OS_VERSION
REQUIRED_OS_ARCH
REQUIRED_OS_NAME
COMPILE_TYPE
! OPENJDK_TARGET_CLIB
OPENJDK_TARGET_CPU_ENDIAN
OPENJDK_TARGET_CPU_BITS
OPENJDK_TARGET_CPU_ARCH
OPENJDK_TARGET_CPU
OPENJDK_TARGET_OS_ENV
OPENJDK_TARGET_OS_TYPE
OPENJDK_TARGET_OS
! OPENJDK_BUILD_CLIB
OPENJDK_BUILD_CPU_ENDIAN
OPENJDK_BUILD_CPU_BITS
OPENJDK_BUILD_CPU_ARCH
OPENJDK_BUILD_CPU
OPENJDK_BUILD_OS_ENV
--- 999,1017 ----
OPENJDK_TARGET_CPU_LEGACY
REQUIRED_OS_VERSION
REQUIRED_OS_ARCH
REQUIRED_OS_NAME
COMPILE_TYPE
! OPENJDK_TARGET_LIBC
OPENJDK_TARGET_CPU_ENDIAN
OPENJDK_TARGET_CPU_BITS
OPENJDK_TARGET_CPU_ARCH
OPENJDK_TARGET_CPU
OPENJDK_TARGET_OS_ENV
OPENJDK_TARGET_OS_TYPE
OPENJDK_TARGET_OS
! OPENJDK_BUILD_LIBC
OPENJDK_BUILD_CPU_ENDIAN
OPENJDK_BUILD_CPU_BITS
OPENJDK_BUILD_CPU_ARCH
OPENJDK_BUILD_CPU
OPENJDK_BUILD_OS_ENV
*** 5201,5211 ****
# 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=1492131030
###############################################################################
#
# Initialization / Boot-strapping
#
--- 5201,5211 ----
# 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=1493245705
###############################################################################
#
# Initialization / Boot-strapping
#
*** 15756,15772 ****
;;
esac
case "$build_os" in
*linux*-musl)
! VAR_CLIB=musl
;;
*linux*-gnu)
! VAR_CLIB=gnu
;;
*)
! VAR_CLIB=default
;;
esac
# First argument is the cpu name from the trip/quad
--- 15756,15772 ----
;;
esac
case "$build_os" in
*linux*-musl)
! VAR_LIBC=musl
;;
*linux*-gnu)
! VAR_LIBC=gnu
;;
*)
! VAR_LIBC=default
;;
esac
# First argument is the cpu name from the trip/quad
*** 15856,15866 ****
fi
OPENJDK_BUILD_CPU="$VAR_CPU"
OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN"
! OPENJDK_BUILD_CLIB="$VAR_CLIB"
--- 15856,15866 ----
fi
OPENJDK_BUILD_CPU="$VAR_CPU"
OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN"
! OPENJDK_BUILD_LIBC="$VAR_LIBC"
*** 15874,15885 ****
$as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&6; }
if test "x$OPENJDK_BUILD_OS" = "xlinux"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-build C library" >&5
$as_echo_n "checking openjdk-build C library... " >&6; }
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_BUILD_CLIB" >&5
! $as_echo "$OPENJDK_BUILD_CLIB" >&6; }
fi
# Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
case "$host_os" in
--- 15874,15885 ----
$as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&6; }
if test "x$OPENJDK_BUILD_OS" = "xlinux"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-build C library" >&5
$as_echo_n "checking openjdk-build C library... " >&6; }
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_BUILD_LIBC" >&5
! $as_echo "$OPENJDK_BUILD_LIBC" >&6; }
fi
# Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
case "$host_os" in
*** 15916,15932 ****
;;
esac
case "$host_os" in
*linux*-musl)
! VAR_CLIB=musl
;;
*linux*-gnu)
! VAR_CLIB=gnu
;;
*)
! VAR_CLIB=default
;;
esac
# First argument is the cpu name from the trip/quad
--- 15916,15932 ----
;;
esac
case "$host_os" in
*linux*-musl)
! VAR_LIBC=musl
;;
*linux*-gnu)
! VAR_LIBC=gnu
;;
*)
! VAR_LIBC=default
;;
esac
# First argument is the cpu name from the trip/quad
*** 16016,16026 ****
fi
OPENJDK_TARGET_CPU="$VAR_CPU"
OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH"
OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN"
! OPENJDK_TARGET_CLIB="$VAR_CLIB"
--- 16016,16026 ----
fi
OPENJDK_TARGET_CPU="$VAR_CPU"
OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH"
OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN"
! OPENJDK_TARGET_LIBC="$VAR_LIBC"
*** 16034,16045 ****
$as_echo "$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&6; }
if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-target C library" >&5
$as_echo_n "checking openjdk-target C library... " >&6; }
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_CLIB" >&5
! $as_echo "$OPENJDK_TARGET_CLIB" >&6; }
fi
# Check whether --with-target-bits was given.
--- 16034,16045 ----
$as_echo "$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&6; }
if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-target C library" >&5
$as_echo_n "checking openjdk-target C library... " >&6; }
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_LIBC" >&5
! $as_echo "$OPENJDK_TARGET_LIBC" >&6; }
fi
# Check whether --with-target-bits was given.
*** 16196,16211 ****
OPENJDK_TARGET_CPU_BUNDLE="x64"
else
OPENJDK_TARGET_CPU_BUNDLE="$OPENJDK_TARGET_CPU"
fi
! OPENJDK_TARGET_CLIB_BUNDLE=""
! if test "x$OPENJDK_TARGET_CLIB" = "xmusl"; then
! OPENJDK_TARGET_CLIB_BUNDLE="-$OPENJDK_TARGET_CLIB"
fi
! OPENJDK_TARGET_BUNDLE_PLATFORM="${OPENJDK_TARGET_OS_BUNDLE}-${OPENJDK_TARGET_CPU_BUNDLE}${OPENJDK_TARGET_CLIB_BUNDLE}"
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
# -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
# unpack200.exe. This variable is used in
--- 16196,16211 ----
OPENJDK_TARGET_CPU_BUNDLE="x64"
else
OPENJDK_TARGET_CPU_BUNDLE="$OPENJDK_TARGET_CPU"
fi
! OPENJDK_TARGET_LIBC_BUNDLE=""
! if test "x$OPENJDK_TARGET_LIBC" = "xmusl"; then
! OPENJDK_TARGET_LIBC_BUNDLE="-$OPENJDK_TARGET_LIBC"
fi
! OPENJDK_TARGET_BUNDLE_PLATFORM="${OPENJDK_TARGET_OS_BUNDLE}-${OPENJDK_TARGET_CPU_BUNDLE}${OPENJDK_TARGET_LIBC_BUNDLE}"
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
# -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
# unpack200.exe. This variable is used in
*** 16279,16292 ****
elif test "x$OPENJDK_TARGET_CPU" != x; then
HOTSPOT_TARGET_CPU_DEFINE=$(echo $OPENJDK_TARGET_CPU | tr a-z A-Z)
fi
! if test "x$OPENJDK_TARGET_CLIB" = "xmusl"; then
! HOTSPOT_TARGET_CLIB=$OPENJDK_TARGET_CLIB
else
! HOTSPOT_TARGET_CLIB=""
fi
# Also store the legacy naming of the cpu.
--- 16279,16292 ----
elif test "x$OPENJDK_TARGET_CPU" != x; then
HOTSPOT_TARGET_CPU_DEFINE=$(echo $OPENJDK_TARGET_CPU | tr a-z A-Z)
fi
! if test "x$OPENJDK_TARGET_LIBC" = "xmusl"; then
! HOTSPOT_TARGET_LIBC=$OPENJDK_TARGET_LIBC
else
! HOTSPOT_TARGET_LIBC=""
fi
# Also store the legacy naming of the cpu.
*** 16360,16375 ****
OPENJDK_BUILD_CPU_BUNDLE="x64"
else
OPENJDK_BUILD_CPU_BUNDLE="$OPENJDK_BUILD_CPU"
fi
! OPENJDK_BUILD_CLIB_BUNDLE=""
! if test "x$OPENJDK_BUILD_CLIB" = "xmusl"; then
! OPENJDK_BUILD_CLIB_BUNDLE="-$OPENJDK_BUILD_CLIB"
fi
! OPENJDK_BUILD_BUNDLE_PLATFORM="${OPENJDK_BUILD_OS_BUNDLE}-${OPENJDK_BUILD_CPU_BUNDLE}${OPENJDK_BUILD_CLIB_BUNDLE}"
if test "x$OPENJDK_BUILD_CPU_BITS" = x64; then
# -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
# unpack200.exe. This variable is used in
--- 16360,16375 ----
OPENJDK_BUILD_CPU_BUNDLE="x64"
else
OPENJDK_BUILD_CPU_BUNDLE="$OPENJDK_BUILD_CPU"
fi
! OPENJDK_BUILD_LIBC_BUNDLE=""
! if test "x$OPENJDK_BUILD_LIBC" = "xmusl"; then
! OPENJDK_BUILD_LIBC_BUNDLE="-$OPENJDK_BUILD_LIBC"
fi
! OPENJDK_BUILD_BUNDLE_PLATFORM="${OPENJDK_BUILD_OS_BUNDLE}-${OPENJDK_BUILD_CPU_BUNDLE}${OPENJDK_BUILD_LIBC_BUNDLE}"
if test "x$OPENJDK_BUILD_CPU_BITS" = x64; then
# -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
# unpack200.exe. This variable is used in
*** 16443,16456 ****
elif test "x$OPENJDK_BUILD_CPU" != x; then
HOTSPOT_BUILD_CPU_DEFINE=$(echo $OPENJDK_BUILD_CPU | tr a-z A-Z)
fi
! if test "x$OPENJDK_BUILD_CLIB" = "xmusl"; then
! HOTSPOT_BUILD_CLIB=$OPENJDK_BUILD_CLIB
else
! HOTSPOT_BUILD_CLIB=""
fi
--- 16443,16456 ----
elif test "x$OPENJDK_BUILD_CPU" != x; then
HOTSPOT_BUILD_CPU_DEFINE=$(echo $OPENJDK_BUILD_CPU | tr a-z A-Z)
fi
! if test "x$OPENJDK_BUILD_LIBC" = "xmusl"; then
! HOTSPOT_BUILD_LIBC=$OPENJDK_BUILD_LIBC
else
! HOTSPOT_BUILD_LIBC=""
fi
< prev index next >