From b6437be6879672d2e0da2c8c7e742f126457b9df Mon Sep 17 00:00:00 2001 From: Klaus Ziegler Date: Tue, 25 Jan 2022 17:33:03 +0000 Subject: [PATCH] Fix a probem building the binutils on SPARC/amd64 PR 28816 * elf/common.h (AT_SUN_HWCAP): Make definition conditional. --- include/ChangeLog | 5 +++++ include/elf/common.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/include/ChangeLog b/include/ChangeLog index cfad7f1e06f..416fb6b8778 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2022-01-25 Klaus Ziegler + + PR 28816 + * elf/common.h (AT_SUN_HWCAP): Make definition conditional. + 2022-01-22 Nick Clifton * 2.38 release branch created. diff --git a/include/elf/common.h b/include/elf/common.h index 190532b8fdc..b1bfa9162b5 100644 --- 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. */ -- 2.30.2