8348327: Incorrect march flag when building libsleef/vector_math_neon.c

vidmik · vidmik · commit ab43ba0ef862 · 2025-01-24T18:07:26.000Z
Reviewed-by: erikj, shade Backport-of: 3ebf889
diff --git a/make/modules/jdk.incubator.vector/Lib.gmk b/make/modules/jdk.incubator.vector/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -64,7 +64,7 @@ ifeq ($(call isTargetOs, linux)+$(call isTargetCpu, aarch64)+$(INCLUDE_COMPILER2
       EXTRA_SRC := libsleef/generated, \
       DISABLED_WARNINGS_gcc := unused-function sign-compare tautological-compare ignored-qualifiers, \
       DISABLED_WARNINGS_clang := unused-function sign-compare tautological-compare ignored-qualifiers, \
-      CFLAGS := $(SVE_CFLAGS), \
+      vector_math_sve.c_CFLAGS := $(SVE_CFLAGS), \
   ))
 
   TARGETS += $(BUILD_LIBSLEEF)

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+# Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`#`
`5`	`5`	`# This code is free software; you can redistribute it and/or modify it`
`@@ -64,7 +64,7 @@ ifeq ($(call isTargetOs, linux)+$(call isTargetCpu, aarch64)+$(INCLUDE_COMPILER2`
`64`	`64`	`EXTRA_SRC := libsleef/generated, \`
`65`	`65`	`DISABLED_WARNINGS_gcc := unused-function sign-compare tautological-compare ignored-qualifiers, \`
`66`	`66`	`DISABLED_WARNINGS_clang := unused-function sign-compare tautological-compare ignored-qualifiers, \`
`67`		`- CFLAGS := $(SVE_CFLAGS), \`
	`67`	`+ vector_math_sve.c_CFLAGS := $(SVE_CFLAGS), \`
`68`	`68`	`))`
`69`	`69`
`70`	`70`	`TARGETS += $(BUILD_LIBSLEEF)`