Hi,
noticed while trying to apply a new change to gcc/configure.ac
-------
In r12-3048-ge0b6d0b39c6, the GAS version parameter was removed from
the gcc_GAS_CHECK_FEATURE macro. It seems that overlapping comit/test
cycles resulted in several AMDGCN and one Darwin commit with the now
extra parameter still present.
This causes wrong configure code to be generated when autoreconf is
used in the gcc directory.
Fixed by removing the extraneous parm from the AMDGCN and Darwin cases.
Checked that this produces “no change” to the configure output when
“autoreconf -I -I../config -I..” is used in the gcc directory.
OK if regstraps succeed on x86_64-linux and darwin?
thanks
Iain
Signed-off-by: Iain Sandoe <i...@sandoe.co.uk>
gcc/ChangeLog:
* configure.ac (darwin2[[0-9]]* | darwin19*): Alter use of
gcc_GAS_CHECK_FEATURE to remove an extraneous parameter.
(amdgcn-* | gcn-*) Likewise.
---
gcc/configure.ac | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gcc/configure.ac b/gcc/configure.ac
index c651db7457f..6f768e02aa4 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -4709,7 +4709,7 @@ foo: nop
case $target_os in
darwin2[[0-9]]* | darwin19*)
gcc_GAS_CHECK_FEATURE([llvm assembler x86-pad-for-align option],
- gcc_cv_as_mllvm_x86_pad_for_align,,
+ gcc_cv_as_mllvm_x86_pad_for_align,
[-mllvm -x86-pad-for-align=false], [.text],,
[AC_DEFINE(HAVE_AS_MLLVM_X86_PAD_FOR_ALIGN, 1,
[Define if your Mac OS X assembler supports -mllvm
-x86-pad-for-align=false.])])
@@ -5350,25 +5350,25 @@ esac
case "$target" in
amdgcn-* | gcn-*)
gcc_GAS_CHECK_FEATURE([assembler accepts -mattr=+sram-ecc for fiji],
- gcc_cv_as_gcn_sram_ecc_fiji,,
+ gcc_cv_as_gcn_sram_ecc_fiji,
[-triple=amdgcn--amdhsa -mcpu=fiji -mattr=-xnack -mattr=+sram-ecc],
[.amdgcn_target "amdgcn-unknown-amdhsa--gfx803+sram-ecc"],,
[AC_DEFINE(HAVE_GCN_SRAM_ECC_FIJI, 1,
[Define if your assembler allows -mattr=+sram-ecc for fiji.])])
gcc_GAS_CHECK_FEATURE([assembler accepts -mattr=+sram-ecc for gfx900],
- gcc_cv_as_gcn_sram_ecc_gfx900,,
+ gcc_cv_as_gcn_sram_ecc_gfx900,
[-triple=amdgcn--amdhsa -mcpu=gfx900 -mattr=-xnack -mattr=+sram-ecc],
[.amdgcn_target "amdgcn-unknown-amdhsa--gfx900+sram-ecc"],,
[AC_DEFINE(HAVE_GCN_SRAM_ECC_GFX900, 1,
[Define if your assembler allows -mattr=+sram-ecc for gfx900.])])
gcc_GAS_CHECK_FEATURE([assembler accepts -mattr=+sram-ecc for gfx906],
- gcc_cv_as_gcn_sram_ecc_gfx906,,
+ gcc_cv_as_gcn_sram_ecc_gfx906,
[-triple=amdgcn--amdhsa -mcpu=gfx906 -mattr=-xnack -mattr=+sram-ecc],
[.amdgcn_target "amdgcn-unknown-amdhsa--gfx906+sram-ecc"],,
[AC_DEFINE(HAVE_GCN_SRAM_ECC_GFX906, 1,
[Define if your assembler allows -mattr=+sram-ecc for gfx906.])])
gcc_GAS_CHECK_FEATURE([assembler accepts -mattr=+sram-ecc for gfx908],
- gcc_cv_as_gcn_sram_ecc_gfx908,,
+ gcc_cv_as_gcn_sram_ecc_gfx908,
[-triple=amdgcn--amdhsa -mcpu=gfx908 -mattr=-xnack -mattr=+sram-ecc],
[.amdgcn_target "amdgcn-unknown-amdhsa--gfx908+sram-ecc"],,
[AC_DEFINE(HAVE_GCN_SRAM_ECC_GFX908, 1,
--
2.24.3 (Apple Git-128)
