diff options
author | Niels Möller <nisse@lysator.liu.se> | 2021-01-10 20:39:49 +0100 |
---|---|---|
committer | Niels Möller <nisse@lysator.liu.se> | 2021-01-10 20:39:49 +0100 |
commit | 49cb4039be99d2d49f5c97edd22fc47976c34651 (patch) | |
tree | 0ba253eb7f3edad0afddf0ecf3760f1cae8955d6 | |
parent | 1c88685a3421753509772823c05f3355ff6486ee (diff) | |
download | nettle-49cb4039be99d2d49f5c97edd22fc47976c34651.tar.gz |
ppc: Fix use of __GLIBC_PREREQ in fat-ppc.c.
* fat-ppc.c: Don't use __GLIBC_PREREQ in the same preprocessor
conditional as defined(__GLIBC_PREREQ), but move to a nested #if
conditional. Fixes compile error on OpenBSD/powerpc64, reported by
Jasper Lievisse Adriaanse.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | fat-ppc.c | 11 |
2 files changed, 13 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2021-01-10 Niels Möller <nisse@lysator.liu.se> + + * fat-ppc.c: Don't use __GLIBC_PREREQ in the same preprocessor + conditional as defined(__GLIBC_PREREQ), but move to a nested #if + conditional. Fixes compile error on OpenBSD/powerpc64, reported by + Jasper Lievisse Adriaanse. + 2021-01-04 Niels Möller <nisse@lysator.liu.se> * Released Nettle-3.7. @@ -42,11 +42,12 @@ #if defined(_AIX) # include <sys/systemcfg.h> -#elif defined(__linux__) && defined(__GLIBC__) && \ - defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 16) -# define USE_GETAUXVAL 1 -# include <asm/cputable.h> -# include <sys/auxv.h> +#elif defined(__linux__) && defined(__GLIBC__) && defined(__GLIBC_PREREQ) +# if __GLIBC_PREREQ(2, 16) +# define USE_GETAUXVAL 1 +# include <asm/cputable.h> +# include <sys/auxv.h> +# endif #elif defined(__FreeBSD__) # include <machine/cpu.h> # ifdef PPC_FEATURE2_HAS_VEC_CRYPTO |