Use %ifdef in sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions
Commit Message
On Tue, 9 Sep 2014, Roland McGrath wrote:
> > +/* The PowerPC64 ELFv2 ABI is being used.
> > +#undef HAVE_ELFV2_ABI
>
> Unterminated comment.
>
> Otherwise seems OK to me.
Thanks, here's a version with that corrected for convenience in testing.
Comments
On 09-09-2014 18:55, Joseph S. Myers wrote:
> On Tue, 9 Sep 2014, Roland McGrath wrote:
>
>>> +/* The PowerPC64 ELFv2 ABI is being used.
>>> +#undef HAVE_ELFV2_ABI
>> Unterminated comment.
>>
>> Otherwise seems OK to me.
> Thanks, here's a version with that corrected for convenience in testing.
Checked on powerpc64 and powerpc64le, thanks.
>
> diff --git a/config.h.in b/config.h.in
> index 7da1a9f..ed26221 100644
> --- a/config.h.in
> +++ b/config.h.in
> @@ -257,4 +257,7 @@
> /* Define if using the IEEE 754-2008 NaN encoding on the MIPS target. */
> #undef HAVE_MIPS_NAN2008
>
> +/* The PowerPC64 ELFv2 ABI is being used. */
> +#undef HAVE_ELFV2_ABI
> +
> #endif
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
> index aa1302a..eb46415 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
> @@ -173,6 +173,9 @@ $as_echo "$libc_cv_ppc64_elfv2_abi" >&6; }
> if test $libc_cv_ppc64_elfv2_abi = yes; then
> config_vars="$config_vars
> default-abi = 64-v2"
> + # For shlib-versions.
> + $as_echo "#define HAVE_ELFV2_ABI 1" >>confdefs.h
> +
> else
> config_vars="$config_vars
> default-abi = 64-v1"
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac
> index de04689..0822915 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac
> @@ -12,6 +12,8 @@ AC_CACHE_CHECK([whether the compiler is using the PowerPC64 ELFv2 ABI],
> ], libc_cv_ppc64_elfv2_abi=yes, libc_cv_ppc64_elfv2_abi=no)])
> if test $libc_cv_ppc64_elfv2_abi = yes; then
> LIBC_CONFIG_VAR([default-abi], [64-v2])
> + # For shlib-versions.
> + AC_DEFINE(HAVE_ELFV2_ABI)
> else
> LIBC_CONFIG_VAR([default-abi], [64-v1])
> # Compiler that do not support ELFv2 ABI does not define _CALL_ELF
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions b/sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions
> index f648023..1febda4 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions
> @@ -1,4 +1,7 @@
> -powerpc64-.*-linux.* DEFAULT GLIBC_2.3
> +%ifdef HAVE_ELFV2_ABI
> powerpc.*le-.*-linux.* DEFAULT GLIBC_2.17
> -powerpc64-.*-linux.* libpthread=0 GLIBC_2.3
> powerpc.*le-.*-linux.* libpthread=0 GLIBC_2.17
> +%else
> +powerpc64-.*-linux.* DEFAULT GLIBC_2.3
> +powerpc64-.*-linux.* libpthread=0 GLIBC_2.3
> +%endif
>
@@ -257,4 +257,7 @@
/* Define if using the IEEE 754-2008 NaN encoding on the MIPS target. */
#undef HAVE_MIPS_NAN2008
+/* The PowerPC64 ELFv2 ABI is being used. */
+#undef HAVE_ELFV2_ABI
+
#endif
@@ -173,6 +173,9 @@ $as_echo "$libc_cv_ppc64_elfv2_abi" >&6; }
if test $libc_cv_ppc64_elfv2_abi = yes; then
config_vars="$config_vars
default-abi = 64-v2"
+ # For shlib-versions.
+ $as_echo "#define HAVE_ELFV2_ABI 1" >>confdefs.h
+
else
config_vars="$config_vars
default-abi = 64-v1"
@@ -12,6 +12,8 @@ AC_CACHE_CHECK([whether the compiler is using the PowerPC64 ELFv2 ABI],
], libc_cv_ppc64_elfv2_abi=yes, libc_cv_ppc64_elfv2_abi=no)])
if test $libc_cv_ppc64_elfv2_abi = yes; then
LIBC_CONFIG_VAR([default-abi], [64-v2])
+ # For shlib-versions.
+ AC_DEFINE(HAVE_ELFV2_ABI)
else
LIBC_CONFIG_VAR([default-abi], [64-v1])
# Compiler that do not support ELFv2 ABI does not define _CALL_ELF
@@ -1,4 +1,7 @@
-powerpc64-.*-linux.* DEFAULT GLIBC_2.3
+%ifdef HAVE_ELFV2_ABI
powerpc.*le-.*-linux.* DEFAULT GLIBC_2.17
-powerpc64-.*-linux.* libpthread=0 GLIBC_2.3
powerpc.*le-.*-linux.* libpthread=0 GLIBC_2.17
+%else
+powerpc64-.*-linux.* DEFAULT GLIBC_2.3
+powerpc64-.*-linux.* libpthread=0 GLIBC_2.3
+%endif