Fix a probem building the binutils on SPARC/amd64

	PR 28816
	* elf/common.h (AT_SUN_HWCAP): Make definition conditional.

diff --git a/include/ChangeLog b/include/ChangeLog
index cfad7f1e06f3848ecca39b252621c34a4ec118ab..416fb6b877881da2feb3c0badabda693d9cce580 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2022-01-25  Klaus Ziegler  <klausz@haus-gisela.de>
+
+       PR 28816
+       * elf/common.h (AT_SUN_HWCAP): Make definition conditional.
+
 2022-01-22  Nick Clifton  <nickc@redhat.com>
 
        * 2.38 release branch created.

diff --git a/include/elf/common.h b/include/elf/common.h
index 190532b8fdcfbe97e8c86cffeb21ce5f2bbe0353..b1bfa9162b5d5d186b44a0ea09801414310dbdd2 100644 (file)
--- a/include/elf/common.h
+++ b/include/elf/common.h
@@ -1406,7 +1406,9 @@
 #define AT_SUN_PLATFORM 2008    /* Platform name string.  */
 #define AT_SUN_CAP_HW1 2009    /* Machine dependent hints about
                                   processor capabilities.  */
+#ifndef AT_SUN_HWCAP
 #define AT_SUN_HWCAP   AT_SUN_CAP_HW1 /* For backward compat only.  */
+#endif
 #define AT_SUN_IFLUSH   2010    /* Should flush icache? */
 #define AT_SUN_CPU      2011    /* CPU name string.  */
 #define AT_SUN_EMUL_ENTRY 2012 /* COFF entry point address.  */