Skip to content

Commit b50c11f

Browse files
swesongaerikj79
authored andcommitted
8366195: Remove unnecessary quotes around -Ta ml64 assembler argument
Reviewed-by: erikj
1 parent 991ac9e commit b50c11f

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

make/autoconf/flags.m4

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,12 +320,16 @@ AC_DEFUN([FLAGS_SETUP_TOOLCHAIN_CONTROL],
320320
[
321321
if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
322322
CC_OUT_OPTION=-Fo
323+
if test "x$OPENJDK_TARGET_CPU" != xaarch64; then
324+
AS_NON_ASM_EXTENSION_OPTION=-Ta
325+
fi
323326
else
324327
# The option used to specify the target .o,.a or .so file.
325328
# When compiling, how to specify the to be created object file.
326329
CC_OUT_OPTION='-o$(SPACE)'
327330
fi
328331
AC_SUBST(CC_OUT_OPTION)
332+
AC_SUBST(AS_NON_ASM_EXTENSION_OPTION)
329333
330334
# Generate make dependency files
331335
if test "x$TOOLCHAIN_TYPE" = xgcc; then

make/autoconf/spec.gmk.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,7 @@ CXX_VERSION_NUMBER := @CXX_VERSION_NUMBER@
492492
HOTSPOT_TOOLCHAIN_TYPE := @HOTSPOT_TOOLCHAIN_TYPE@
493493

494494
CC_OUT_OPTION := @CC_OUT_OPTION@
495+
AS_NON_ASM_EXTENSION_OPTION := @AS_NON_ASM_EXTENSION_OPTION@
495496

496497
# Flags used for overriding the default opt setting for a C/C++ source file.
497498
C_O_FLAG_HIGHEST_JVM := @C_O_FLAG_HIGHEST_JVM@

make/common/native/CompileFile.gmk

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,6 @@ define CreateCompiledNativeFileBody
155155
endif
156156
$1_FLAGS := $$($1_FLAGS) -DASSEMBLY_SRC_FILE='"$$($1_REL_ASM_SRC)"' \
157157
-include $(TOPDIR)/make/data/autoheaders/assemblyprefix.h
158-
else ifeq ($(TOOLCHAIN_TYPE), microsoft)
159-
ifeq ($(OPENJDK_TARGET_CPU), aarch64)
160-
$1_NON_ASM_EXTENSION_FLAG :=
161-
else
162-
$1_NON_ASM_EXTENSION_FLAG := "-Ta"
163-
endif
164158
endif
165159
else ifneq ($$(filter %.cpp %.cc %.mm, $$($1_FILENAME)), )
166160
# Compile as a C++ or Objective-C++ file
@@ -242,7 +236,7 @@ define CreateCompiledNativeFileBody
242236
# For assembler calls just create empty dependency lists
243237
$$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
244238
$$($1_COMPILER) $$($1_FLAGS) \
245-
$(CC_OUT_OPTION)$$($1_OBJ) $$($1_NON_ASM_EXTENSION_FLAG) $$($1_SRC_FILE))) \
239+
$(CC_OUT_OPTION)$$($1_OBJ) $(AS_NON_ASM_EXTENSION_OPTION) $$($1_SRC_FILE))) \
246240
| $(TR) -d '\r' | $(GREP) -v -e "Assembling:" || test "$$$$?" = "1" ; \
247241
$(ECHO) > $$($1_DEPS_FILE) ; \
248242
$(ECHO) > $$($1_DEPS_TARGETS_FILE)

0 commit comments

Comments
 (0)