Skip to content

Commit 2abe2ff

Browse files
magicusmagicus
committedAug 30, 2024
8339235: Fix indentation in build system
Reviewed-by: erikj
·
jdk-25+13jdk-24+14
1 parent bb28b0d commit 2abe2ff

25 files changed

+122
-111
lines changed
 

‎make/CompileInterimLangtools.gmk

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.ja
6565
$(SED) $(INTERIM_TOOL_PROVIDER_PATTERN) $< > $@
6666

6767
java.compiler.interim_EXTRA_FILES := \
68-
$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.java
68+
$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.java
6969

7070
TARGETS += $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.java
7171

‎make/CompileJavaModules.gmk

+6-6
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ $(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.pr
7575

7676
CreateHkTargets = \
7777
$(call FilterExcludedTranslations, \
78-
$(patsubst $(TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
79-
$(subst /share/classes,, \
80-
$(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1)) \
81-
) \
82-
), \
83-
.properties \
78+
$(patsubst $(TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
79+
$(subst /share/classes,, \
80+
$(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1)) \
81+
) \
82+
), \
83+
.properties \
8484
)
8585

8686
################################################################################

‎make/InitSupport.gmk

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ ifeq ($(HAS_SPEC),)
205205
ifeq ($$(patsubst !%,,$$(CONF)),)
206206
# A CONF starting with ! means we should negate the search term
207207
matching_confs := $$(strip $$(foreach var, $$(all_confs), \
208-
$$(if $$(findstring $$(subst !,,$$(CONF)), $$(var)), ,$$(var))))
208+
$$(if $$(findstring $$(subst !,,$$(CONF)), $$(var)), ,$$(var))))
209209
else
210210
matching_confs := $$(strip $$(foreach var, $$(all_confs), \
211211
$$(if $$(findstring $$(CONF), $$(var)), $$(var))))

‎make/autoconf/basic_tools.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ AC_DEFUN([BASIC_CHECK_MAKE_VERSION],
129129
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
130130
MAKE_VERSION_EXPR="-e 4\."
131131
MAKE_REQUIRED_VERSION="4.0"
132-
else
132+
else
133133
MAKE_VERSION_EXPR="-e 3\.8[[12]] -e 4\."
134134
MAKE_REQUIRED_VERSION="3.81"
135135
fi

‎make/autoconf/boot-jdk.m4

+6-5
Original file line numberDiff line numberDiff line change
@@ -602,11 +602,12 @@ AC_DEFUN([BOOTJDK_SETUP_BUILD_JDK],
602602
BUILD_JDK_FOUND="no"
603603
if test "x$with_build_jdk" != "x"; then
604604
BOOTJDK_CHECK_BUILD_JDK([
605-
if test "x$with_build_jdk" != x; then
606-
BUILD_JDK=$with_build_jdk
607-
BUILD_JDK_FOUND=maybe
608-
AC_MSG_NOTICE([Found potential Build JDK using configure arguments])
609-
fi])
605+
if test "x$with_build_jdk" != x; then
606+
BUILD_JDK=$with_build_jdk
607+
BUILD_JDK_FOUND=maybe
608+
AC_MSG_NOTICE([Found potential Build JDK using configure arguments])
609+
fi
610+
])
610611
EXTERNAL_BUILDJDK=true
611612
else
612613
if test "x$COMPILE_TYPE" = "xcross"; then

‎make/autoconf/flags-ldflags.m4

+3-3
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP],
168168
169169
# MIPS ABI does not support GNU hash style
170170
if test "x${OPENJDK_$1_CPU}" = xmips ||
171-
test "x${OPENJDK_$1_CPU}" = xmipsel ||
172-
test "x${OPENJDK_$1_CPU}" = xmips64 ||
173-
test "x${OPENJDK_$1_CPU}" = xmips64el; then
171+
test "x${OPENJDK_$1_CPU}" = xmipsel ||
172+
test "x${OPENJDK_$1_CPU}" = xmips64 ||
173+
test "x${OPENJDK_$1_CPU}" = xmips64el; then
174174
$1_CPU_LDFLAGS="${$1_CPU_LDFLAGS} -Wl,--hash-style=sysv"
175175
else
176176
$1_CPU_LDFLAGS="${$1_CPU_LDFLAGS} -Wl,--hash-style=gnu"

‎make/autoconf/jdk-options.m4

+7-8
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
235235
else
236236
HOTSPOT_OVERRIDE_LIBPATH=${with_jni_libpath}
237237
if test "x$OPENJDK_TARGET_OS" != "xlinux" &&
238-
test "x$OPENJDK_TARGET_OS" != "xbsd" &&
239-
test "x$OPENJDK_TARGET_OS" != "xaix"; then
238+
test "x$OPENJDK_TARGET_OS" != "xbsd" &&
239+
test "x$OPENJDK_TARGET_OS" != "xaix"; then
240240
AC_MSG_RESULT([fail])
241241
AC_MSG_ERROR([Overriding JNI library path is supported only on Linux, BSD and AIX.])
242242
fi
@@ -421,8 +421,8 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_ADDRESS_SANITIZER],
421421
CHECK_AVAILABLE: [
422422
AC_MSG_CHECKING([if AddressSanitizer (asan) is available])
423423
if test "x$TOOLCHAIN_TYPE" = "xgcc" ||
424-
test "x$TOOLCHAIN_TYPE" = "xclang" ||
425-
test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
424+
test "x$TOOLCHAIN_TYPE" = "xclang" ||
425+
test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
426426
AC_MSG_RESULT([yes])
427427
else
428428
AC_MSG_RESULT([no])
@@ -431,7 +431,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_ADDRESS_SANITIZER],
431431
],
432432
IF_ENABLED: [
433433
if test "x$TOOLCHAIN_TYPE" = "xgcc" ||
434-
test "x$TOOLCHAIN_TYPE" = "xclang"; then
434+
test "x$TOOLCHAIN_TYPE" = "xclang"; then
435435
# ASan is simply incompatible with gcc -Wstringop-truncation. See
436436
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85650
437437
# It's harmless to be suppressed in clang as well.
@@ -707,9 +707,8 @@ AC_DEFUN([JDKOPT_ALLOW_ABSOLUTE_PATHS_IN_OUTPUT],
707707
[
708708
AC_ARG_ENABLE([absolute-paths-in-output],
709709
[AS_HELP_STRING([--disable-absolute-paths-in-output],
710-
[Set to disable to prevent any absolute paths from the build to end up in
711-
any of the build output. @<:@disabled in release builds, otherwise enabled@:>@])
712-
])
710+
[Set to disable to prevent any absolute paths from the build to end up in
711+
any of the build output. @<:@disabled in release builds, otherwise enabled@:>@])])
713712
714713
AC_MSG_CHECKING([if absolute paths should be allowed in the build output])
715714
if test "x$enable_absolute_paths_in_output" = "xno"; then

‎make/autoconf/jdk-version.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
9393
UTIL_ARG_WITH(NAME: jdk-rc-name, TYPE: string,
9494
DEFAULT: $PRODUCT_NAME $JDK_RC_PLATFORM_NAME,
9595
DESC: [Set JDK RC name. This is used for FileDescription and ProductName
96-
properties of MS Windows binaries.],
96+
properties of MS Windows binaries.],
9797
DEFAULT_DESC: [from branding.conf],
9898
CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE])
9999
AC_SUBST(JDK_RC_NAME)
@@ -105,7 +105,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
105105
RESULT: COMPANY_NAME,
106106
DEFAULT: $COMPANY_NAME,
107107
DESC: [Set vendor name. Among others, used to set the 'java.vendor'
108-
and 'java.vm.vendor' system properties.],
108+
and 'java.vm.vendor' system properties.],
109109
DEFAULT_DESC: [from branding.conf],
110110
CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE])
111111
AC_SUBST(COMPANY_NAME)

‎make/autoconf/lib-bundled.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ AC_DEFUN_ONCE([LIB_SETUP_GIFLIB],
119119
AC_DEFUN_ONCE([LIB_SETUP_LIBPNG],
120120
[
121121
AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng],
122-
[use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
122+
[use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
123123
124124
PKG_CHECK_MODULES(PNG, libpng, [LIBPNG_FOUND=yes], [LIBPNG_FOUND=no])
125125
AC_MSG_CHECKING([for which libpng to use])

‎make/autoconf/lib-freetype.m4

+11-9
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
7373
[
7474
AC_ARG_WITH(freetype, [AS_HELP_STRING([--with-freetype],
7575
[specify whether to use 'system' or 'bundled' freetype.
76-
The selected option applies to both build time and run time.
77-
The default behaviour can be platform dependent.
78-
If using 'system' and either the include files or libraries cannot be
79-
located automatically, then additionally specify both using
80-
--with-freetype-include and --with-freetype-lib.])])
76+
The selected option applies to both build time and run time.
77+
The default behaviour can be platform dependent.
78+
If using 'system' and either the include files or libraries cannot be
79+
located automatically, then additionally specify both using
80+
--with-freetype-include and --with-freetype-lib.])])
8181
AC_ARG_WITH(freetype-include, [AS_HELP_STRING([--with-freetype-include],
8282
[specify directory for the freetype include files])])
8383
AC_ARG_WITH(freetype-lib, [AS_HELP_STRING([--with-freetype-lib],
@@ -95,8 +95,10 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
9595
FREETYPE_CFLAGS=
9696
FREETYPE_LIBS=
9797
98-
if (test "x$with_freetype_include" = "x" && test "x$with_freetype_lib" != "x") || \
99-
(test "x$with_freetype_include" != "x" && test "x$with_freetype_lib" = "x"); then
98+
if (test "x$with_freetype_include" = "x" && \
99+
test "x$with_freetype_lib" != "x") || \
100+
(test "x$with_freetype_include" != "x" && \
101+
test "x$with_freetype_lib" = "x"); then
100102
AC_MSG_ERROR([Must specify both or neither of --with-freetype-include and --with-freetype-lib])
101103
fi
102104
@@ -126,8 +128,8 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
126128
fi
127129
128130
if test "x$FREETYPE_TO_USE" = "xsystem" && \
129-
(test "x$OPENJDK_TARGET_OS" = "xwindows" || \
130-
test "x$OPENJDK_TARGET_OS" = "xmacosx"); then
131+
(test "x$OPENJDK_TARGET_OS" = "xwindows" || \
132+
test "x$OPENJDK_TARGET_OS" = "xmacosx"); then
131133
AC_MSG_ERROR([Only bundled freetype can be specified on Mac and Windows])
132134
fi
133135

‎make/autoconf/lib-hsdis.m4

+6-4
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ AC_DEFUN([LIB_BUILD_BINUTILS],
163163
164164
# We don't know the version, not checking for libsframe.a
165165
if test -e $BINUTILS_INSTALL_DIR/lib/libbfd.a && \
166-
test -e $BINUTILS_INSTALL_DIR/lib/libopcodes.a && \
167-
test -e $BINUTILS_INSTALL_DIR/lib/libiberty.a; then
166+
test -e $BINUTILS_INSTALL_DIR/lib/libopcodes.a && \
167+
test -e $BINUTILS_INSTALL_DIR/lib/libiberty.a; then
168168
AC_MSG_NOTICE([Found binutils binaries in binutils install directory -- not building])
169169
else
170170
# On Windows, we cannot build with the normal Microsoft CL, but must instead use
@@ -267,8 +267,10 @@ AC_DEFUN([LIB_SETUP_HSDIS_BINUTILS],
267267
elif test "x$BINUTILS_INSTALL_DIR" != x; then
268268
disasm_header="\"$BINUTILS_INSTALL_DIR/include/dis-asm.h\""
269269
if test -e $BINUTILS_INSTALL_DIR/lib/libbfd.a && \
270-
test -e $BINUTILS_INSTALL_DIR/lib/libopcodes.a && \
271-
(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
270+
test -e $BINUTILS_INSTALL_DIR/lib/libopcodes.a && \
271+
(test -e $BINUTILS_INSTALL_DIR/lib/libiberty.a || \
272+
test -e $BINUTILS_INSTALL_DIR/lib64/libiberty.a || \
273+
test -e $BINUTILS_INSTALL_DIR/lib32/libiberty.a); then
272274
HSDIS_CFLAGS="-DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB -I$BINUTILS_INSTALL_DIR/include"
273275
274276
# libiberty ignores --libdir and may be installed in $BINUTILS_INSTALL_DIR/lib, $BINUTILS_INSTALL_DIR/lib32

‎make/autoconf/libraries.m4

+6-6
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ AC_DEFUN([LIB_SETUP_JVM_LIBS],
9999
if HOTSPOT_CHECK_JVM_VARIANT(zero); then
100100
if test "x$OPENJDK_$1_OS" = xlinux &&
101101
(test "x$OPENJDK_$1_CPU" = xarm ||
102-
test "x$OPENJDK_$1_CPU" = xm68k ||
103-
test "x$OPENJDK_$1_CPU" = xmips ||
104-
test "x$OPENJDK_$1_CPU" = xmipsel ||
105-
test "x$OPENJDK_$1_CPU" = xppc ||
106-
test "x$OPENJDK_$1_CPU" = xsh ||
107-
test "x$OPENJDK_$1_CPU" = xriscv32); then
102+
test "x$OPENJDK_$1_CPU" = xm68k ||
103+
test "x$OPENJDK_$1_CPU" = xmips ||
104+
test "x$OPENJDK_$1_CPU" = xmipsel ||
105+
test "x$OPENJDK_$1_CPU" = xppc ||
106+
test "x$OPENJDK_$1_CPU" = xsh ||
107+
test "x$OPENJDK_$1_CPU" = xriscv32); then
108108
BASIC_JVM_LIBS_$1="$BASIC_JVM_LIBS_$1 -latomic"
109109
fi
110110
fi

‎make/autoconf/platform.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ AC_DEFUN([PLATFORM_EXTRACT_TARGET_AND_BUILD],
390390
AC_DEFUN([PLATFORM_SETUP_TARGET_CPU_BITS],
391391
[
392392
AC_ARG_WITH(target-bits, [AS_HELP_STRING([--with-target-bits],
393-
[build 32-bit or 64-bit binaries (for platforms that support it), e.g. --with-target-bits=32 @<:@guessed@:>@])])
393+
[build 32-bit or 64-bit binaries (for platforms that support it), e.g. --with-target-bits=32 @<:@guessed@:>@])])
394394
395395
# We have three types of compiles:
396396
# native == normal compilation, target system == build system
@@ -665,7 +665,7 @@ AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET],
665665
AC_DEFUN([PLATFORM_CHECK_DEPRECATION],
666666
[
667667
AC_ARG_ENABLE(deprecated-ports, [AS_HELP_STRING([--enable-deprecated-ports@<:@=yes/no@:>@],
668-
[Suppress the error when configuring for a deprecated port @<:@no@:>@])])
668+
[Suppress the error when configuring for a deprecated port @<:@no@:>@])])
669669
if test "x$OPENJDK_TARGET_OS" = xwindows && test "x$OPENJDK_TARGET_CPU" = xx86; then
670670
if test "x$enable_deprecated_ports" = "xyes"; then
671671
AC_MSG_WARN([The Windows 32-bit x86 port is deprecated and may be removed in a future release.])

‎make/autoconf/toolchain_microsoft.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE],
161161
# version, pass -vcvars_ver=<toolset_version> argument to vcvarsall.bat.
162162
AC_ARG_WITH(msvc-toolset-version, [AS_HELP_STRING([--with-msvc-toolset-version],
163163
[specific MSVC toolset version to use, passed as -vcvars_ver argument to
164-
pass to vcvarsall.bat (Windows only)])])
164+
pass to vcvarsall.bat (Windows only)])])
165165
166166
TARGET_CPU="$1"
167167
VS_VERSION="$2"

‎make/common/FindTests.gmk

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ $(foreach root, $(JTREG_TESTROOTS), \
5656
$(eval include $(root)/TEST.ROOT) \
5757
$(eval $(root)_JTREG_GROUP_FILES := $$(addprefix $(root)/, $$(groups))) \
5858
$(eval JTREG_GROUP_FILES += $$($(root)_JTREG_GROUP_FILES)) \
59-
) \
59+
) \
6060
)
6161

6262
# Cache the expensive to calculate test names in a generated makefile.

‎make/common/JavaCompilation.gmk

+2-2
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,9 @@ define SetupJavaCompilationBody
255255
$1_JAVAC := $$(INTERIM_LANGTOOLS_ARGS) -m jdk.compiler.interim/com.sun.tools.javac.Main
256256

257257
ifeq ($$($1_SMALL_JAVA), true)
258-
$1_JAVAC_CMD := $$(JAVA_SMALL) $$($1_JAVA_FLAGS) $$($1_JAVAC)
258+
$1_JAVAC_CMD := $$(JAVA_SMALL) $$($1_JAVA_FLAGS) $$($1_JAVAC)
259259
else
260-
$1_JAVAC_CMD := $$(JAVA) $$($1_JAVA_FLAGS) $$($1_JAVAC)
260+
$1_JAVAC_CMD := $$(JAVA) $$($1_JAVA_FLAGS) $$($1_JAVAC)
261261
endif
262262
endif
263263

‎make/common/JdkNativeCompilation.gmk

+2-2
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,10 @@ define AddJdkLibrary
196196
# Determine if the library in question is static.
197197
# Ideally, we should not hardcode these
198198
ifeq ($(call isTargetOs, aix)+$$($1_$2_MODULE):$$($1_$2_NAME), true+java.base:jli)
199-
$1_$2_STATIC_LIBRARY := true
199+
$1_$2_STATIC_LIBRARY := true
200200
endif
201201
ifeq ($$($1_$2_MODULE):$$($1_$2_NAME), gtest:gtest)
202-
$1_$2_STATIC_LIBRARY := true
202+
$1_$2_STATIC_LIBRARY := true
203203
endif
204204

205205
# Setup $1_$2_LIBPATH.

‎make/common/MakeBase.gmk

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ DependOnVariableFileName = \
247247
DependOnVariableWriteFile = \
248248
$(call MakeDir, $(dir $($1_filename))) \
249249
$(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
250-
$($1_filename)) \
250+
$($1_filename)) \
251251

252252
# Does the actual work with parameters stripped.
253253
# If the file exists AND the contents is the same as the variable, do nothing

‎make/common/Modules.gmk

+2-2
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ FindTransitiveDepsForModule = \
221221
$(foreach m, $(call FindDepsForModule, $1), \
222222
$(call FindDepsForModule, $m) \
223223
$(foreach n, $(call FindDepsForModule, $m), \
224-
$(call FindDepsForModule, $n))))
224+
$(call FindDepsForModule, $n))))
225225

226226
# Find dependencies ("requires") transitively in 3 levels for a set of modules.
227227
# Param 1: List of modules to find dependencies for.
@@ -240,7 +240,7 @@ FindTransitiveIndirectDepsForModule = \
240240
$(foreach m, $(call FindIndirectExportsForModule, $1), \
241241
$(call FindIndirectExportsForModule, $m) \
242242
$(foreach n, $(call FindIndirectExportsForModule, $m), \
243-
$(call FindIndirectExportsForModule, $n))))
243+
$(call FindIndirectExportsForModule, $n))))
244244

245245
# Finds indirect exported modules transitively in 3 levels for a set of modules.
246246
# Param 1: List of modules to find indirect exported modules for.

‎make/common/Utils.gmk

+2-2
Original file line numberDiff line numberDiff line change
@@ -270,11 +270,11 @@ Or = \
270270
ifeq ($(IS_GNU_DATE), yes)
271271
EpochToISO8601 = \
272272
$(shell $(DATE) --utc --date="@$(strip $1)" \
273-
+"$(ISO_8601_FORMAT_STRING)" 2> /dev/null)
273+
+"$(ISO_8601_FORMAT_STRING)" 2> /dev/null)
274274
else
275275
EpochToISO8601 = \
276276
$(shell $(DATE) -u -j -f "%s" "$(strip $1)" \
277-
+"$(ISO_8601_FORMAT_STRING)" 2> /dev/null)
277+
+"$(ISO_8601_FORMAT_STRING)" 2> /dev/null)
278278
endif
279279

280280
################################################################################

‎make/common/native/DebugSymbols.gmk

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ define CreateDebugSymbols
9494

9595
$1 += $$($1_DEBUGINFO_ZIP)
9696
endif
97-
endif # !STATIC_LIBRARY
97+
endif # !STATIC_LIBRARY
9898
endif # $1_DEBUG_SYMBOLS != false
9999
endif # COPY_DEBUG_SYMBOLS
100100
endef

‎make/hotspot/gensrc/GensrcAdlc.gmk

+5-5
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,11 @@ ifeq ($(call check-jvm-feature, compiler2), true)
204204

205205
INSERT_FILENAME_AWK_SCRIPT := \
206206
'{ \
207-
if (CUR_FN != FILENAME) { CUR_FN=FILENAME; NR_BASE=NR-1; need_lineno=1 } \
208-
if (need_lineno && $$0 !~ /\/\//) \
209-
{ print "\n\n\#line " (NR-NR_BASE) " \"" FILENAME "\""; need_lineno=0 }; \
210-
print \
211-
}'
207+
if (CUR_FN != FILENAME) { CUR_FN=FILENAME; NR_BASE=NR-1; need_lineno=1 } \
208+
if (need_lineno && $$0 !~ /\/\//) \
209+
{ print "\n\n\#line " (NR-NR_BASE) " \"" FILENAME "\""; need_lineno=0 }; \
210+
print \
211+
}'
212212

213213
$(SINGLE_AD_SRCFILE): $(AD_SRC_FILES)
214214
$(call LogInfo, Preprocessing adlc files $(^F))

‎make/hotspot/lib/JvmFeatures.gmk

+18-11
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ endif
4747
ifeq ($(call check-jvm-feature, zero), true)
4848
JVM_EXCLUDES += opto libadt
4949
JVM_EXCLUDE_PATTERNS += c1_ c1/ c2_ runtime_ /c2/
50-
JVM_EXCLUDE_FILES += templateInterpreter.cpp templateInterpreterGenerator.cpp \
51-
bcEscapeAnalyzer.cpp ciTypeFlow.cpp
52-
JVM_CFLAGS_FEATURES += -DZERO -DZERO_LIBARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' $(LIBFFI_CFLAGS)
50+
JVM_EXCLUDE_FILES += templateInterpreter.cpp \
51+
templateInterpreterGenerator.cpp bcEscapeAnalyzer.cpp ciTypeFlow.cpp
52+
JVM_CFLAGS_FEATURES += -DZERO \
53+
-DZERO_LIBARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' $(LIBFFI_CFLAGS)
5354
JVM_LIBS_FEATURES += $(LIBFFI_LIBS)
5455
ifeq ($(ENABLE_LIBFFI_BUNDLING), true)
5556
JVM_LDFLAGS_FEATURES += $(call SET_EXECUTABLE_ORIGIN,/..)
@@ -69,7 +70,8 @@ endif
6970
ifeq ($(call check-jvm-feature, minimal), true)
7071
JVM_CFLAGS_FEATURES += -DMINIMAL_JVM -DVMTYPE=\"Minimal\"
7172
ifeq ($(call isTargetOs, linux), true)
72-
# Override the default -g with a more liberal strip policy for the minimal JVM
73+
# Override the default -g with a more liberal strip policy for the
74+
# minimal JVM
7375
JVM_STRIPFLAGS := --strip-unneeded
7476
endif
7577
endif
@@ -80,11 +82,14 @@ endif
8082

8183
ifneq ($(call check-jvm-feature, jvmti), true)
8284
JVM_CFLAGS_FEATURES += -DINCLUDE_JVMTI=0
83-
JVM_EXCLUDE_FILES += jvmtiGetLoadedClasses.cpp jvmtiThreadState.cpp jvmtiExtensions.cpp \
84-
jvmtiImpl.cpp jvmtiManageCapabilities.cpp jvmtiRawMonitor.cpp jvmtiUtil.cpp jvmtiTrace.cpp \
85-
jvmtiCodeBlobEvents.cpp jvmtiEnv.cpp jvmtiRedefineClasses.cpp jvmtiEnvBase.cpp jvmtiEnvThreadState.cpp \
86-
jvmtiTagMap.cpp jvmtiEventController.cpp evmCompat.cpp jvmtiEnter.xsl jvmtiExport.cpp \
87-
jvmtiClassFileReconstituter.cpp jvmtiTagMapTable.cpp jvmtiAgent.cpp jvmtiAgentList.cpp jfrJvmtiAgent.cpp
85+
JVM_EXCLUDE_FILES += jvmtiGetLoadedClasses.cpp jvmtiThreadState.cpp \
86+
jvmtiExtensions.cpp jvmtiImpl.cpp jvmtiManageCapabilities.cpp \
87+
jvmtiRawMonitor.cpp jvmtiUtil.cpp jvmtiTrace.cpp jvmtiCodeBlobEvents.cpp \
88+
jvmtiEnv.cpp jvmtiRedefineClasses.cpp jvmtiEnvBase.cpp \
89+
jvmtiEnvThreadState.cpp jvmtiTagMap.cpp jvmtiEventController.cpp \
90+
evmCompat.cpp jvmtiEnter.xsl jvmtiExport.cpp \
91+
jvmtiClassFileReconstituter.cpp jvmtiTagMapTable.cpp jvmtiAgent.cpp \
92+
jvmtiAgentList.cpp jfrJvmtiAgent.cpp
8893
endif
8994

9095
ifneq ($(call check-jvm-feature, jvmci), true)
@@ -166,8 +171,10 @@ ifeq ($(call check-jvm-feature, link-time-opt), true)
166171
# later on if desired
167172
JVM_OPTIMIZATION := HIGHEST_JVM
168173
ifeq ($(call isCompiler, gcc), true)
169-
JVM_CFLAGS_FEATURES += -flto=auto -fuse-linker-plugin -fno-strict-aliasing -fno-fat-lto-objects
170-
JVM_LDFLAGS_FEATURES += $(CXX_O_FLAG_HIGHEST_JVM) -flto=auto -fuse-linker-plugin -fno-strict-aliasing
174+
JVM_CFLAGS_FEATURES += -flto=auto -fuse-linker-plugin -fno-strict-aliasing \
175+
-fno-fat-lto-objects
176+
JVM_LDFLAGS_FEATURES += $(CXX_O_FLAG_HIGHEST_JVM) -flto=auto \
177+
-fuse-linker-plugin -fno-strict-aliasing
171178
else ifeq ($(call isCompiler, microsoft), true)
172179
JVM_CFLAGS_FEATURES += -GL
173180
JVM_LDFLAGS_FEATURES += -LTCG:INCREMENTAL

‎make/modules/java.desktop/lib/ClientLibraries.gmk

+33-33
Original file line numberDiff line numberDiff line change
@@ -281,51 +281,51 @@ endif
281281
################################################################################
282282

283283
ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
284-
LIBFONTMANAGER_EXTRA_SRC =
285-
LIBFONTMANAGER_LIBS += $(HARFBUZZ_LIBS)
286-
LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
284+
LIBFONTMANAGER_EXTRA_SRC =
285+
LIBFONTMANAGER_LIBS += $(HARFBUZZ_LIBS)
286+
LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
287287
else
288-
LIBFONTMANAGER_EXTRA_SRC = libharfbuzz
288+
LIBFONTMANAGER_EXTRA_SRC = libharfbuzz
289289

290-
ifeq ($(call isTargetOs, windows), false)
291-
HARFBUZZ_CFLAGS += -DGETPAGESIZE -DHAVE_MPROTECT -DHAVE_PTHREAD \
290+
ifeq ($(call isTargetOs, windows), false)
291+
HARFBUZZ_CFLAGS += -DGETPAGESIZE -DHAVE_MPROTECT -DHAVE_PTHREAD \
292292
-DHAVE_SYSCONF -DHAVE_SYS_MMAN_H -DHAVE_UNISTD_H \
293293
-DHB_NO_PRAGMA_GCC_DIAGNOSTIC
294-
endif
295-
ifeq ($(call isTargetOs, linux macosx), true)
296-
HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES -DHB_NO_VISIBILITY
297-
endif
298-
299-
# hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later.
300-
# hb-subset and hb-style APIs are not needed, excluded to cut on compilation
301-
# time.
302-
LIBFONTMANAGER_EXCLUDE_FILES += gsubgpos-context.cc hb-ft.cc hb-style.cc \
294+
endif
295+
ifeq ($(call isTargetOs, linux macosx), true)
296+
HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES -DHB_NO_VISIBILITY
297+
endif
298+
299+
# hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later.
300+
# hb-subset and hb-style APIs are not needed, excluded to cut on compilation
301+
# time.
302+
LIBFONTMANAGER_EXCLUDE_FILES += gsubgpos-context.cc hb-ft.cc hb-style.cc \
303303
hb-subset-cff-common.cc hb-subset-cff1.cc hb-subset-cff2.cc \
304304
hb-subset-input.cc hb-subset-instancer-solver.cc hb-subset-plan.cc \
305305
hb-subset.cc
306306

307-
# list of disabled warnings and the compilers for which it was specifically
308-
# added.
309-
# array-bounds -> GCC 12 on Alpine Linux
310-
# parentheses -> GCC 6
311-
# range-loop-analysis -> clang on Xcode12
307+
# list of disabled warnings and the compilers for which it was specifically
308+
# added.
309+
# array-bounds -> GCC 12 on Alpine Linux
310+
# parentheses -> GCC 6
311+
# range-loop-analysis -> clang on Xcode12
312312

313-
HARFBUZZ_DISABLED_WARNINGS_gcc := missing-field-initializers \
314-
strict-aliasing unused-result array-bounds parentheses \
313+
HARFBUZZ_DISABLED_WARNINGS_gcc := missing-field-initializers \
314+
strict-aliasing unused-result array-bounds parentheses \
315315
unused-variable
316-
# noexcept-type required for GCC 7 builds. Not required for GCC 8+.
317-
# expansion-to-defined required for GCC 9 builds. Not required for GCC 10+.
318-
# maybe-uninitialized required for GCC 8 builds. Not required for GCC 9+.
319-
# calloc-transposed-args required for GCC 14 builds. (fixed upstream in
320-
# Harfbuzz 032c931e1c0cfb20f18e5acb8ba005775242bd92)
321-
HARFBUZZ_DISABLED_WARNINGS_CXX_gcc := class-memaccess noexcept-type \
322-
expansion-to-defined dangling-reference maybe-uninitialized \
323-
calloc-transposed-args
324-
HARFBUZZ_DISABLED_WARNINGS_clang := missing-field-initializers \
316+
# noexcept-type required for GCC 7 builds. Not required for GCC 8+.
317+
# expansion-to-defined required for GCC 9 builds. Not required for GCC 10+.
318+
# maybe-uninitialized required for GCC 8 builds. Not required for GCC 9+.
319+
# calloc-transposed-args required for GCC 14 builds. (fixed upstream in
320+
# Harfbuzz 032c931e1c0cfb20f18e5acb8ba005775242bd92)
321+
HARFBUZZ_DISABLED_WARNINGS_CXX_gcc := class-memaccess noexcept-type \
322+
expansion-to-defined dangling-reference maybe-uninitialized \
323+
calloc-transposed-args
324+
HARFBUZZ_DISABLED_WARNINGS_clang := missing-field-initializers \
325325
range-loop-analysis
326-
HARFBUZZ_DISABLED_WARNINGS_microsoft := 4267 4244
326+
HARFBUZZ_DISABLED_WARNINGS_microsoft := 4267 4244
327327

328-
LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
328+
LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
329329
endif
330330

331331
LIBFONTMANAGER_EXTRA_HEADER_DIRS := \

‎make/modules/jdk.accessibility/Launcher.gmk

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ ifeq ($(call isTargetOs, windows), true)
9393
LIBS_windows := advapi32.lib comctl32.lib gdi32.lib user32.lib, \
9494
VERSIONINFO_RESOURCE := \
9595
$(ACCESSIBILITY_SRCDIR)/jaccesswalker/jaccesswalkerWindow.rc, \
96-
))
96+
))
9797

9898
TARGETS += $$(BUILD_JACCESSWALKER$1)
9999
endef

1 commit comments

Comments
 (1)

openjdk-notifier[bot] commented on Aug 30, 2024

@openjdk-notifier[bot]
openjdk-notifier[bot]
on Aug 30, 2024

Review

Issues

Please sign in to comment.