8339235: Fix indentation in build system
Reviewed-by: erikj
This commit is contained in:
parent
bb28b0d229
commit
2abe2ff69b
@ -606,7 +606,8 @@ AC_DEFUN([BOOTJDK_SETUP_BUILD_JDK],
|
|||||||
BUILD_JDK=$with_build_jdk
|
BUILD_JDK=$with_build_jdk
|
||||||
BUILD_JDK_FOUND=maybe
|
BUILD_JDK_FOUND=maybe
|
||||||
AC_MSG_NOTICE([Found potential Build JDK using configure arguments])
|
AC_MSG_NOTICE([Found potential Build JDK using configure arguments])
|
||||||
fi])
|
fi
|
||||||
|
])
|
||||||
EXTERNAL_BUILDJDK=true
|
EXTERNAL_BUILDJDK=true
|
||||||
else
|
else
|
||||||
if test "x$COMPILE_TYPE" = "xcross"; then
|
if test "x$COMPILE_TYPE" = "xcross"; then
|
||||||
|
@ -708,8 +708,7 @@ AC_DEFUN([JDKOPT_ALLOW_ABSOLUTE_PATHS_IN_OUTPUT],
|
|||||||
AC_ARG_ENABLE([absolute-paths-in-output],
|
AC_ARG_ENABLE([absolute-paths-in-output],
|
||||||
[AS_HELP_STRING([--disable-absolute-paths-in-output],
|
[AS_HELP_STRING([--disable-absolute-paths-in-output],
|
||||||
[Set to disable to prevent any absolute paths from the build to end up in
|
[Set to disable to prevent any absolute paths from the build to end up in
|
||||||
any of the build output. @<:@disabled in release builds, otherwise enabled@:>@])
|
any of the build output. @<:@disabled in release builds, otherwise enabled@:>@])])
|
||||||
])
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([if absolute paths should be allowed in the build output])
|
AC_MSG_CHECKING([if absolute paths should be allowed in the build output])
|
||||||
if test "x$enable_absolute_paths_in_output" = "xno"; then
|
if test "x$enable_absolute_paths_in_output" = "xno"; then
|
||||||
|
@ -95,8 +95,10 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
|
|||||||
FREETYPE_CFLAGS=
|
FREETYPE_CFLAGS=
|
||||||
FREETYPE_LIBS=
|
FREETYPE_LIBS=
|
||||||
|
|
||||||
if (test "x$with_freetype_include" = "x" && test "x$with_freetype_lib" != "x") || \
|
if (test "x$with_freetype_include" = "x" && \
|
||||||
(test "x$with_freetype_include" != "x" && test "x$with_freetype_lib" = "x"); then
|
test "x$with_freetype_lib" != "x") || \
|
||||||
|
(test "x$with_freetype_include" != "x" && \
|
||||||
|
test "x$with_freetype_lib" = "x"); then
|
||||||
AC_MSG_ERROR([Must specify both or neither of --with-freetype-include and --with-freetype-lib])
|
AC_MSG_ERROR([Must specify both or neither of --with-freetype-include and --with-freetype-lib])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -268,7 +268,9 @@ AC_DEFUN([LIB_SETUP_HSDIS_BINUTILS],
|
|||||||
disasm_header="\"$BINUTILS_INSTALL_DIR/include/dis-asm.h\""
|
disasm_header="\"$BINUTILS_INSTALL_DIR/include/dis-asm.h\""
|
||||||
if test -e $BINUTILS_INSTALL_DIR/lib/libbfd.a && \
|
if test -e $BINUTILS_INSTALL_DIR/lib/libbfd.a && \
|
||||||
test -e $BINUTILS_INSTALL_DIR/lib/libopcodes.a && \
|
test -e $BINUTILS_INSTALL_DIR/lib/libopcodes.a && \
|
||||||
(test -e $BINUTILS_INSTALL_DIR/lib/libiberty.a || test -e $BINUTILS_INSTALL_DIR/lib64/libiberty.a || test -e $BINUTILS_INSTALL_DIR/lib32/libiberty.a); then
|
(test -e $BINUTILS_INSTALL_DIR/lib/libiberty.a || \
|
||||||
|
test -e $BINUTILS_INSTALL_DIR/lib64/libiberty.a || \
|
||||||
|
test -e $BINUTILS_INSTALL_DIR/lib32/libiberty.a); then
|
||||||
HSDIS_CFLAGS="-DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB -I$BINUTILS_INSTALL_DIR/include"
|
HSDIS_CFLAGS="-DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB -I$BINUTILS_INSTALL_DIR/include"
|
||||||
|
|
||||||
# libiberty ignores --libdir and may be installed in $BINUTILS_INSTALL_DIR/lib, $BINUTILS_INSTALL_DIR/lib32
|
# libiberty ignores --libdir and may be installed in $BINUTILS_INSTALL_DIR/lib, $BINUTILS_INSTALL_DIR/lib32
|
||||||
|
@ -47,9 +47,10 @@ endif
|
|||||||
ifeq ($(call check-jvm-feature, zero), true)
|
ifeq ($(call check-jvm-feature, zero), true)
|
||||||
JVM_EXCLUDES += opto libadt
|
JVM_EXCLUDES += opto libadt
|
||||||
JVM_EXCLUDE_PATTERNS += c1_ c1/ c2_ runtime_ /c2/
|
JVM_EXCLUDE_PATTERNS += c1_ c1/ c2_ runtime_ /c2/
|
||||||
JVM_EXCLUDE_FILES += templateInterpreter.cpp templateInterpreterGenerator.cpp \
|
JVM_EXCLUDE_FILES += templateInterpreter.cpp \
|
||||||
bcEscapeAnalyzer.cpp ciTypeFlow.cpp
|
templateInterpreterGenerator.cpp bcEscapeAnalyzer.cpp ciTypeFlow.cpp
|
||||||
JVM_CFLAGS_FEATURES += -DZERO -DZERO_LIBARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' $(LIBFFI_CFLAGS)
|
JVM_CFLAGS_FEATURES += -DZERO \
|
||||||
|
-DZERO_LIBARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' $(LIBFFI_CFLAGS)
|
||||||
JVM_LIBS_FEATURES += $(LIBFFI_LIBS)
|
JVM_LIBS_FEATURES += $(LIBFFI_LIBS)
|
||||||
ifeq ($(ENABLE_LIBFFI_BUNDLING), true)
|
ifeq ($(ENABLE_LIBFFI_BUNDLING), true)
|
||||||
JVM_LDFLAGS_FEATURES += $(call SET_EXECUTABLE_ORIGIN,/..)
|
JVM_LDFLAGS_FEATURES += $(call SET_EXECUTABLE_ORIGIN,/..)
|
||||||
@ -69,7 +70,8 @@ endif
|
|||||||
ifeq ($(call check-jvm-feature, minimal), true)
|
ifeq ($(call check-jvm-feature, minimal), true)
|
||||||
JVM_CFLAGS_FEATURES += -DMINIMAL_JVM -DVMTYPE=\"Minimal\"
|
JVM_CFLAGS_FEATURES += -DMINIMAL_JVM -DVMTYPE=\"Minimal\"
|
||||||
ifeq ($(call isTargetOs, linux), true)
|
ifeq ($(call isTargetOs, linux), true)
|
||||||
# Override the default -g with a more liberal strip policy for the minimal JVM
|
# Override the default -g with a more liberal strip policy for the
|
||||||
|
# minimal JVM
|
||||||
JVM_STRIPFLAGS := --strip-unneeded
|
JVM_STRIPFLAGS := --strip-unneeded
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@ -80,11 +82,14 @@ endif
|
|||||||
|
|
||||||
ifneq ($(call check-jvm-feature, jvmti), true)
|
ifneq ($(call check-jvm-feature, jvmti), true)
|
||||||
JVM_CFLAGS_FEATURES += -DINCLUDE_JVMTI=0
|
JVM_CFLAGS_FEATURES += -DINCLUDE_JVMTI=0
|
||||||
JVM_EXCLUDE_FILES += jvmtiGetLoadedClasses.cpp jvmtiThreadState.cpp jvmtiExtensions.cpp \
|
JVM_EXCLUDE_FILES += jvmtiGetLoadedClasses.cpp jvmtiThreadState.cpp \
|
||||||
jvmtiImpl.cpp jvmtiManageCapabilities.cpp jvmtiRawMonitor.cpp jvmtiUtil.cpp jvmtiTrace.cpp \
|
jvmtiExtensions.cpp jvmtiImpl.cpp jvmtiManageCapabilities.cpp \
|
||||||
jvmtiCodeBlobEvents.cpp jvmtiEnv.cpp jvmtiRedefineClasses.cpp jvmtiEnvBase.cpp jvmtiEnvThreadState.cpp \
|
jvmtiRawMonitor.cpp jvmtiUtil.cpp jvmtiTrace.cpp jvmtiCodeBlobEvents.cpp \
|
||||||
jvmtiTagMap.cpp jvmtiEventController.cpp evmCompat.cpp jvmtiEnter.xsl jvmtiExport.cpp \
|
jvmtiEnv.cpp jvmtiRedefineClasses.cpp jvmtiEnvBase.cpp \
|
||||||
jvmtiClassFileReconstituter.cpp jvmtiTagMapTable.cpp jvmtiAgent.cpp jvmtiAgentList.cpp jfrJvmtiAgent.cpp
|
jvmtiEnvThreadState.cpp jvmtiTagMap.cpp jvmtiEventController.cpp \
|
||||||
|
evmCompat.cpp jvmtiEnter.xsl jvmtiExport.cpp \
|
||||||
|
jvmtiClassFileReconstituter.cpp jvmtiTagMapTable.cpp jvmtiAgent.cpp \
|
||||||
|
jvmtiAgentList.cpp jfrJvmtiAgent.cpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(call check-jvm-feature, jvmci), true)
|
ifneq ($(call check-jvm-feature, jvmci), true)
|
||||||
@ -166,8 +171,10 @@ ifeq ($(call check-jvm-feature, link-time-opt), true)
|
|||||||
# later on if desired
|
# later on if desired
|
||||||
JVM_OPTIMIZATION := HIGHEST_JVM
|
JVM_OPTIMIZATION := HIGHEST_JVM
|
||||||
ifeq ($(call isCompiler, gcc), true)
|
ifeq ($(call isCompiler, gcc), true)
|
||||||
JVM_CFLAGS_FEATURES += -flto=auto -fuse-linker-plugin -fno-strict-aliasing -fno-fat-lto-objects
|
JVM_CFLAGS_FEATURES += -flto=auto -fuse-linker-plugin -fno-strict-aliasing \
|
||||||
JVM_LDFLAGS_FEATURES += $(CXX_O_FLAG_HIGHEST_JVM) -flto=auto -fuse-linker-plugin -fno-strict-aliasing
|
-fno-fat-lto-objects
|
||||||
|
JVM_LDFLAGS_FEATURES += $(CXX_O_FLAG_HIGHEST_JVM) -flto=auto \
|
||||||
|
-fuse-linker-plugin -fno-strict-aliasing
|
||||||
else ifeq ($(call isCompiler, microsoft), true)
|
else ifeq ($(call isCompiler, microsoft), true)
|
||||||
JVM_CFLAGS_FEATURES += -GL
|
JVM_CFLAGS_FEATURES += -GL
|
||||||
JVM_LDFLAGS_FEATURES += -LTCG:INCREMENTAL
|
JVM_LDFLAGS_FEATURES += -LTCG:INCREMENTAL
|
||||||
|
Loading…
Reference in New Issue
Block a user