mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 03:49:32 +02:00
armv8/armv9: Avoid using -march when -mcpu is chosen
Current include logic goes into generic arm v8/v9 architecture tunes and adds corresponding -march option after synthesizing it from various tune fragments, this is fine for a machine which is using armv8/armv9 based tunes but cortex tunes are intentionally using -mcpu option based on selected tune value. So when cortex based default tune is selected for a machine, it will add both -mcpu and -march to the compiler commandline which can result in invalid combinations for this pair in gcc's own logic. This can then result in compiler warnings/errors reporting this e.g. aarch64-yoe-linux-gcc -mcpu=cortex-a72.cortex-a53 -march=armv8-a+crc+crypto -mbranch-protection=standard ... cc1: error: switch '-mcpu=cortex-a72.cortex-a53' conflicts with '-march=armv8-a+crc+crypto' switch and resulted in options '+crc+crypto' being added [-Werror] This is seen in lot of configure test results in glibc 2.39 and the warning is promoted to errors by gcc in some of these checks especially with gcc-14, the logs also show it as warning in other places in configure checks. mcpu option will compute relevant march implicitly as it specifies a cpu implementation and this will be the right value to use, therefore do not specify -march when -mcpu is already describing the cpu. (From OE-Core rev: e64f0c1b6ac5d598a79a21de5f3060f83cb9523e) Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Ross Burton <ross.burton@arm.com> Cc: Jon Mason <jdmason@kudzu.us> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
@@ -8,6 +8,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
|
||||
# Little Endian base configs
|
||||
AVAILTUNES += "cortexa55"
|
||||
ARMPKGARCH:tune-cortexa55 = "cortexa55"
|
||||
TUNE_FEATURES:tune-cortexa55 = "${TUNE_FEATURES:tune-armv8-2a-crypto} cortexa55"
|
||||
# We do not want -march since -mcpu is added above to cover for it
|
||||
TUNE_FEATURES:tune-cortexa55 = "aarch64 crypto cortexa55"
|
||||
PACKAGE_EXTRA_ARCHS:tune-cortexa55 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa55"
|
||||
BASE_LIB:tune-cortexa55 = "lib64"
|
||||
|
||||
@@ -11,6 +11,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
|
||||
# Little Endian base configs
|
||||
AVAILTUNES += "cortexa65"
|
||||
ARMPKGARCH:tune-cortexa65 = "cortexa65"
|
||||
TUNE_FEATURES:tune-cortexa65 = "${TUNE_FEATURES:tune-armv8-2a-crypto} cortexa65"
|
||||
# We do not want -march since -mcpu is added above to cover for it
|
||||
TUNE_FEATURES:tune-cortexa65 = "aarch64 crypto cortexa65"
|
||||
PACKAGE_EXTRA_ARCHS:tune-cortexa65 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa65"
|
||||
BASE_LIB:tune-cortexa65 = "lib64"
|
||||
|
||||
@@ -11,6 +11,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
|
||||
# Little Endian base configs
|
||||
AVAILTUNES += "cortexa65ae"
|
||||
ARMPKGARCH:tune-cortexa65ae = "cortexa65ae"
|
||||
TUNE_FEATURES:tune-cortexa65ae = "${TUNE_FEATURES:tune-armv8-2a-crypto} cortexa65ae"
|
||||
# We do not want -march since -mcpu is added above to cover for it
|
||||
TUNE_FEATURES:tune-cortexa65ae = "aarch64 crypto cortexa65ae"
|
||||
PACKAGE_EXTRA_ARCHS:tune-cortexa65ae = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa65ae"
|
||||
BASE_LIB:tune-cortexa65ae = "lib64"
|
||||
|
||||
@@ -12,7 +12,8 @@ require conf/machine/include/arm/arch-armv8-2a.inc
|
||||
AVAILTUNES += "cortexa75-cortexa55 cortexa75-cortexa55-crypto"
|
||||
ARMPKGARCH:tune-cortexa75-cortexa55 = "cortexa75-cortexa55"
|
||||
ARMPKGARCH:tune-cortexa75-cortexa55-crypto = "cortexa75-cortexa55-crypto"
|
||||
TUNE_FEATURES:tune-cortexa75-cortexa55 = "${TUNE_FEATURES:tune-armv8-2a} cortexa75-cortexa55"
|
||||
# We do not want -march since -mcpu is added above to cover for it
|
||||
TUNE_FEATURES:tune-cortexa75-cortexa55 = "aarch64 cortexa75-cortexa55"
|
||||
TUNE_FEATURES:tune-cortexa75-cortexa55-crypto = "${TUNE_FEATURES:tune-cortexa75-cortexa55} crypto"
|
||||
PACKAGE_EXTRA_ARCHS:tune-cortexa75-cortexa55 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a} cortexa75-cortexa55"
|
||||
PACKAGE_EXTRA_ARCHS:tune-cortexa75-cortexa55-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa75-cortexa55 cortexa75-cortexa55-crypto"
|
||||
|
||||
@@ -11,6 +11,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
|
||||
# Little Endian base configs
|
||||
AVAILTUNES += "cortexa75"
|
||||
ARMPKGARCH:tune-cortexa75 = "cortexa75"
|
||||
TUNE_FEATURES:tune-cortexa75 = "${TUNE_FEATURES:tune-armv8-2a-crypto} cortexa75"
|
||||
# We do not want -march since -mcpu is added above to cover for it
|
||||
TUNE_FEATURES:tune-cortexa75 = "aarch64 crypto cortexa75"
|
||||
PACKAGE_EXTRA_ARCHS:tune-cortexa75 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa75"
|
||||
BASE_LIB:tune-cortexa75 = "lib64"
|
||||
|
||||
@@ -12,7 +12,8 @@ require conf/machine/include/arm/arch-armv8-2a.inc
|
||||
AVAILTUNES += "cortexa76-cortexa55 cortexa76-cortexa55-crypto"
|
||||
ARMPKGARCH:tune-cortexa76-cortexa55 = "cortexa76-cortexa55"
|
||||
ARMPKGARCH:tune-cortexa76-cortexa55-crypto = "cortexa76-cortexa55-crypto"
|
||||
TUNE_FEATURES:tune-cortexa76-cortexa55 = "${TUNE_FEATURES:tune-armv8-2a} cortexa76-cortexa55"
|
||||
# We do not want -march since -mcpu is added above to cover for it
|
||||
TUNE_FEATURES:tune-cortexa76-cortexa55 = "aarch64 cortexa76-cortexa55"
|
||||
TUNE_FEATURES:tune-cortexa76-cortexa55-crypto = "${TUNE_FEATURES:tune-cortexa76-cortexa55} crypto"
|
||||
PACKAGE_EXTRA_ARCHS:tune-cortexa76-cortexa55 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a} cortexa76-cortexa55"
|
||||
PACKAGE_EXTRA_ARCHS:tune-cortexa76-cortexa55-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa76-cortexa55 cortexa76-cortexa55-crypto"
|
||||
|
||||
@@ -11,6 +11,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
|
||||
# Little Endian base configs
|
||||
AVAILTUNES += "cortexa76"
|
||||
ARMPKGARCH:tune-cortexa76 = "cortexa76"
|
||||
TUNE_FEATURES:tune-cortexa76 = "${TUNE_FEATURES:tune-armv8-2a-crypto} cortexa76"
|
||||
# We do not want -march since -mcpu is added above to cover for it
|
||||
TUNE_FEATURES:tune-cortexa76 = "aarch64 crypto cortexa76"
|
||||
PACKAGE_EXTRA_ARCHS:tune-cortexa76 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa76"
|
||||
BASE_LIB:tune-cortexa76 = "lib64"
|
||||
|
||||
@@ -11,6 +11,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
|
||||
# Little Endian base configs
|
||||
AVAILTUNES += "cortexa76ae"
|
||||
ARMPKGARCH:tune-cortexa76ae = "cortexa76ae"
|
||||
TUNE_FEATURES:tune-cortexa76ae = "${TUNE_FEATURES:tune-armv8-2a-crypto} cortexa76ae"
|
||||
# We do not want -march since -mcpu is added above to cover for it
|
||||
TUNE_FEATURES:tune-cortexa76ae = "aarch64 crypto cortexa76ae"
|
||||
PACKAGE_EXTRA_ARCHS:tune-cortexa76ae = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa76ae"
|
||||
BASE_LIB:tune-cortexa76ae = "lib64"
|
||||
|
||||
@@ -11,6 +11,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
|
||||
# Little Endian base configs
|
||||
AVAILTUNES += "cortexa77"
|
||||
ARMPKGARCH:tune-cortexa77 = "cortexa77"
|
||||
TUNE_FEATURES:tune-cortexa77 = "${TUNE_FEATURES:tune-armv8-2a-crypto} cortexa77"
|
||||
# We do not want -march since -mcpu is added above to cover for it
|
||||
TUNE_FEATURES:tune-cortexa77 = "aarch64 crypto cortexa77"
|
||||
PACKAGE_EXTRA_ARCHS:tune-cortexa77 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} cortexa77"
|
||||
BASE_LIB:tune-cortexa77 = "lib64"
|
||||
|
||||
@@ -11,6 +11,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
|
||||
# Little Endian base configs
|
||||
AVAILTUNES += "neoversee1"
|
||||
ARMPKGARCH:tune-neoversee1 = "neoversee1"
|
||||
TUNE_FEATURES:tune-neoversee1 = "${TUNE_FEATURES:tune-armv8-2a-crypto} neoversee1"
|
||||
# We do not want -march since -mcpu is added above to cover for it
|
||||
TUNE_FEATURES:tune-neoversee1 = "aarch64 crypto neoversee1"
|
||||
PACKAGE_EXTRA_ARCHS:tune-neoversee1 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} neoversee1"
|
||||
BASE_LIB:tune-neoversee1 = "lib64"
|
||||
|
||||
@@ -12,6 +12,6 @@ require conf/machine/include/arm/arch-armv8-2a.inc
|
||||
# Little Endian base configs
|
||||
AVAILTUNES += "neoversen1"
|
||||
ARMPKGARCH:tune-neoversen1 = "neoversen1"
|
||||
TUNE_FEATURES:tune-neoversen1 = "${TUNE_FEATURES:tune-armv8-2a-crypto} neoversen1"
|
||||
TUNE_FEATURES:tune-neoversen1 = "aarch64 crypto neoversen1"
|
||||
PACKAGE_EXTRA_ARCHS:tune-neoversen1 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} neoversen1"
|
||||
BASE_LIB:tune-neoversen1 = "lib64"
|
||||
|
||||
@@ -8,6 +8,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
|
||||
# Little Endian base configs
|
||||
AVAILTUNES += "octeontx2"
|
||||
ARMPKGARCH:tune-octeontx2 = "octeontx2"
|
||||
TUNE_FEATURES:tune-octeontx2 = "${TUNE_FEATURES:tune-armv8-2a-crypto} octeontx2"
|
||||
# We do not want -march since -mcpu is added above to cover for it
|
||||
TUNE_FEATURES:tune-octeontx2 = "aarch64 crypto octeontx2"
|
||||
PACKAGE_EXTRA_ARCHS:tune-octeontx2 = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto} octeontx2"
|
||||
BASE_LIB:tune-octeontx2 = "lib64"
|
||||
|
||||
Reference in New Issue
Block a user