From c8d581bdf731714977b1592e74d05e000535e338 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sun, 6 Jun 2021 05:36:23 -0700 Subject: [PATCH] libgomp: Compile tests with -march=i486 only if needed Don't add -march=i486 if atomic compare-and-swap is supported on 'int'. This fixes libgomp tests with "-march=x86-64 -m32 -fcf-protection". * testsuite/lib/libgomp.exp (libgomp_init): Don't add -march=i486 if atomic compare-and-swap is supported on 'int'. --- libgomp/testsuite/lib/libgomp.exp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index 45c78d8..a205015 100644 --- a/libgomp/testsuite/lib/libgomp.exp +++ b/libgomp/testsuite/lib/libgomp.exp @@ -210,7 +210,8 @@ proc libgomp_init { args } { # We use atomic operations in the testcases to validate results. if { ([istarget i?86-*-*] || [istarget x86_64-*-*]) - && [check_effective_target_ia32] } { + && [check_effective_target_ia32] + && ![check_effective_target_cas_char] } { lappend ALWAYS_CFLAGS "additional_flags=-march=i486" } -- 2.7.4