Merge
This commit is contained in:
commit
f9f1a34ac4
@ -265,3 +265,4 @@ cf22a728521f91a4692b433d39d730a0a1b23155 jdk9-b16
|
||||
ee4fd72b2ec3d92497f37163352f294aa695c6fb jdk9-b20
|
||||
9052803f4d01feda28b3d65f2b64dd457d21c7b6 jdk9-b21
|
||||
8e4bdab4c362aadde2d321f968cd503a2f779e2f jdk9-b22
|
||||
88567461a2cd9b7fb431fee6440005a694df1f47 jdk9-b23
|
||||
|
@ -407,11 +407,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION],
|
||||
C_O_FLAG_HI="-O3"
|
||||
C_O_FLAG_NORM="-O2"
|
||||
fi
|
||||
if test "x$HAS_CFLAG_OPTIMIZE_DEBUG" = "xtrue"; then
|
||||
C_O_FLAG_DEBUG="$CFLAG_OPTIMIZE_DEBUG_FLAG"
|
||||
else
|
||||
C_O_FLAG_DEBUG="-O0"
|
||||
fi
|
||||
C_O_FLAG_DEBUG="-O0"
|
||||
C_O_FLAG_NONE="-O0"
|
||||
elif test "x$TOOLCHAIN_TYPE" = xclang; then
|
||||
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
|
||||
|
@ -4311,7 +4311,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
|
||||
#CUSTOM_AUTOCONF_INCLUDE
|
||||
|
||||
# Do not change or remove the following line, it is needed for consistency checks:
|
||||
DATE_WHEN_GENERATED=1403557683
|
||||
DATE_WHEN_GENERATED=1404942241
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
@ -42011,11 +42011,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
|
||||
C_O_FLAG_HI="-O3"
|
||||
C_O_FLAG_NORM="-O2"
|
||||
fi
|
||||
if test "x$HAS_CFLAG_OPTIMIZE_DEBUG" = "xtrue"; then
|
||||
C_O_FLAG_DEBUG="$CFLAG_OPTIMIZE_DEBUG_FLAG"
|
||||
else
|
||||
C_O_FLAG_DEBUG="-O0"
|
||||
fi
|
||||
C_O_FLAG_DEBUG="-O0"
|
||||
C_O_FLAG_NONE="-O0"
|
||||
elif test "x$TOOLCHAIN_TYPE" = xclang; then
|
||||
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
|
||||
|
@ -66,6 +66,32 @@ jdk_% core_%s svc_%:
|
||||
hotspot_%:
|
||||
@$(NO_STOPPING)$(call SUBDIR_TEST, $(HOTSPOT_DIR), TEST="$@" $@)
|
||||
|
||||
#
|
||||
# jtreg_tests
|
||||
#
|
||||
# Invocation:
|
||||
#
|
||||
# make jtreg_tests TESTDIRS=<test-dirs>
|
||||
#
|
||||
# where <test-dirs> is something like '../<component>/test/runtime',
|
||||
# <component> in turn being one of the top level directories (for
|
||||
# example 'hotspot').
|
||||
#
|
||||
# The below will strip the path prefix and delegate to the
|
||||
# corresponding ../<component>/test/Makefile.
|
||||
|
||||
ifneq ($(TESTDIRS),)
|
||||
# Extract the component from ../<component>/...
|
||||
COMPONENT=$(word 2,$(subst /, ,$(TESTDIRS)))
|
||||
|
||||
# Strip off the ../<component>/test prefix and pass the rest as TESTDIRS
|
||||
# to the delegate Makefile
|
||||
TESTDIRS_TESTS=$(patsubst ../$(COMPONENT)/test/%,%,$(TESTDIRS))
|
||||
endif
|
||||
|
||||
jtreg_tests:
|
||||
@$(NO_STOPPING)$(call SUBDIR_TEST, $(TOPDIR)/$(COMPONENT), TESTDIRS=$(TESTDIRS_TESTS) $@)
|
||||
|
||||
################################################################
|
||||
|
||||
# Phony targets (e.g. these are not filenames)
|
||||
|
Loading…
x
Reference in New Issue
Block a user