| Message ID | 20210114141958.4118371-1-adhemerval.zanella@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Fix x86 build with --enable-tunable=no | expand |
On Thu, Jan 14, 2021 at 6:20 AM Adhemerval Zanella <adhemerval.zanella@linaro.org> wrote: > > Checked on x86_64-linux-gnu. > --- > sysdeps/x86/get-isa-level.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/sysdeps/x86/get-isa-level.h b/sysdeps/x86/get-isa-level.h > index a86e1e8941..cd9e6945a7 100644 > --- a/sysdeps/x86/get-isa-level.h > +++ b/sysdeps/x86/get-isa-level.h > @@ -16,6 +16,8 @@ > License along with the GNU C Library; if not, see > <https://www.gnu.org/licenses/>. */ > > +#include <elf.h> > +#include <ldsodefs.h> > #include <sys/platform/x86.h> > > /* Get GNU_PROPERTY_X86_ISA_1_BASELINE and GNU_PROPERTY_X86_ISA_1_V[234] > -- > 2.25.1 > LGTM. Thanks.
On 14/01/2021 11:48, H.J. Lu wrote: > On Thu, Jan 14, 2021 at 6:20 AM Adhemerval Zanella > <adhemerval.zanella@linaro.org> wrote: >> >> Checked on x86_64-linux-gnu. >> --- >> sysdeps/x86/get-isa-level.h | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/sysdeps/x86/get-isa-level.h b/sysdeps/x86/get-isa-level.h >> index a86e1e8941..cd9e6945a7 100644 >> --- a/sysdeps/x86/get-isa-level.h >> +++ b/sysdeps/x86/get-isa-level.h >> @@ -16,6 +16,8 @@ >> License along with the GNU C Library; if not, see >> <https://www.gnu.org/licenses/>. */ >> >> +#include <elf.h> >> +#include <ldsodefs.h> >> #include <sys/platform/x86.h> >> >> /* Get GNU_PROPERTY_X86_ISA_1_BASELINE and GNU_PROPERTY_X86_ISA_1_V[234] >> -- >> 2.25.1 In fact the correct fix is the below, by including 'ldsodefs.h' on get-isa-level.h makes sysdeps/x86_64/tst-glibc-hwcaps.c tests build fail. diff --git a/sysdeps/x86/get-isa-level.h b/sysdeps/x86/get-isa-level.h index a86e1e8941..3f0e27ee59 100644 --- a/sysdeps/x86/get-isa-level.h +++ b/sysdeps/x86/get-isa-level.h @@ -16,6 +16,7 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ +#include <elf.h> #include <sys/platform/x86.h> /* Get GNU_PROPERTY_X86_ISA_1_BASELINE and GNU_PROPERTY_X86_ISA_1_V[234] diff --git a/sysdeps/x86_64/dl-hwcaps-subdirs.c b/sysdeps/x86_64/dl-hwcaps-subdirs.c index e030534f1b..4acd343183 100644 --- a/sysdeps/x86_64/dl-hwcaps-subdirs.c +++ b/sysdeps/x86_64/dl-hwcaps-subdirs.c @@ -18,6 +18,7 @@ #include <dl-hwcaps.h> #include <cpu-features.h> +#include <ldsodefs.h> #include <get-isa-level.h> const char _dl_hwcaps_subdirs[] = "x86-64-v4:x86-64-v3:x86-64-v2";
diff --git a/sysdeps/x86/get-isa-level.h b/sysdeps/x86/get-isa-level.h index a86e1e8941..cd9e6945a7 100644 --- a/sysdeps/x86/get-isa-level.h +++ b/sysdeps/x86/get-isa-level.h @@ -16,6 +16,8 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ +#include <elf.h> +#include <ldsodefs.h> #include <sys/platform/x86.h> /* Get GNU_PROPERTY_X86_ISA_1_BASELINE and GNU_PROPERTY_X86_ISA_1_V[234]