aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-10-09 19:15:33 +0200
committerFlorian Weimer <fweimer@redhat.com>2019-10-09 19:15:33 +0200
commit00fe3c6657161a96890067666760ea8cf22b791c (patch)
tree01ed1a0b3da6276d3de541e1e5e946366b2539f1
parent112a630b086541d29c20e3bb024f4270dadd68c6 (diff)
downloadglibc-00fe3c6657161a96890067666760ea8cf22b791c.zip
glibc-00fe3c6657161a96890067666760ea8cf22b791c.tar.gz
glibc-00fe3c6657161a96890067666760ea8cf22b791c.tar.bz2
sparc: Assume GOTDATA support in the toolchain
HAVE_GCC_GOTDATA has apparently never been used. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-rw-r--r--ChangeLog7
-rw-r--r--config.h.in3
-rw-r--r--sysdeps/sparc/configure39
-rw-r--r--sysdeps/sparc/configure.ac28
4 files changed, 9 insertions, 68 deletions
diff --git a/ChangeLog b/ChangeLog
index bf76ac7..fa343ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-09 Florian Weimer <fweimer@redhat.com>
+
+ * config.h.in (HAVE_GCC_GOTDATA): Remove.
+ * sysdeps/sparc/configure.ac: Remove checks for HAVE_GCC_GOTDATA
+ and PI_STATIC_AND_HIDDEN. Always define PI_STATIC_AND_HIDDEN.
+ * sysdeps/sparc/configure: Regenerate.
+
2019-10-09 Petr Vorel <pvorel@suse.cz>
* include/dirent.h (__getdents64): Update comment.
diff --git a/config.h.in b/config.h.in
index 824dfe8..dea43df 100644
--- a/config.h.in
+++ b/config.h.in
@@ -47,9 +47,6 @@
#undef STACK_PROTECTOR_LEVEL
#endif
-/* Defined on SPARC if GCC emits GOTDATA relocations. */
-#undef HAVE_GCC_GOTDATA
-
/* Define if the linker supports the -z combreloc option. */
#undef HAVE_Z_COMBRELOC
diff --git a/sysdeps/sparc/configure b/sysdeps/sparc/configure
index bc6ac14..491b00f 100644
--- a/sysdeps/sparc/configure
+++ b/sysdeps/sparc/configure
@@ -1,41 +1,4 @@
# This file is generated from configure.ac by Autoconf. DO NOT EDIT!
# Local configure fragment for sysdeps/sparc.
-# Check for a GCC emitting GOTDATA relocations.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sparc gcc GOTDATA reloc support" >&5
-$as_echo_n "checking for sparc gcc GOTDATA reloc support... " >&6; }
-if ${libc_cv_sparc_gcc_gotdata+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat > conftest.c <<\EOF
-int data;
-int foo(void)
-{
- return data;
-}
-EOF
-libc_cv_sparc_gcc_gotdata=no
-if { ac_try='${CC-cc} -S $CFLAGS -O2 -fPIC conftest.c 1>&5'
- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- if grep -q 'gdop_hix22' conftest.s \
- && grep -q 'gdop_lox10' conftest.s; then
- libc_cv_sparc_gcc_gotdata=yes
- fi
-fi
-rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_sparc_gcc_gotdata" >&5
-$as_echo "$libc_cv_sparc_gcc_gotdata" >&6; }
-if test $libc_cv_sparc_gcc_gotdata = yes; then
- $as_echo "#define HAVE_GCC_GOTDATA 1" >>confdefs.h
-
-fi
-
-if test $libc_cv_sparc_gcc_gotdata = yes; then
- $as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
-
-fi
+$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
diff --git a/sysdeps/sparc/configure.ac b/sysdeps/sparc/configure.ac
index 43ad541..5cdc0a9 100644
--- a/sysdeps/sparc/configure.ac
+++ b/sysdeps/sparc/configure.ac
@@ -1,30 +1,4 @@
GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
# Local configure fragment for sysdeps/sparc.
-# Check for a GCC emitting GOTDATA relocations.
-AC_CACHE_CHECK(for sparc gcc GOTDATA reloc support, libc_cv_sparc_gcc_gotdata, [dnl
-changequote(,)dnl
-cat > conftest.c <<\EOF
-int data;
-int foo(void)
-{
- return data;
-}
-EOF
-changequote([,])dnl
-dnl
-libc_cv_sparc_gcc_gotdata=no
-if AC_TRY_COMMAND(${CC-cc} -S $CFLAGS -O2 -fPIC conftest.c 1>&AS_MESSAGE_LOG_FD); then
- if grep -q 'gdop_hix22' conftest.s \
- && grep -q 'gdop_lox10' conftest.s; then
- libc_cv_sparc_gcc_gotdata=yes
- fi
-fi
-rm -f conftest*])
-if test $libc_cv_sparc_gcc_gotdata = yes; then
- AC_DEFINE(HAVE_GCC_GOTDATA)
-fi
-
-if test $libc_cv_sparc_gcc_gotdata = yes; then
- AC_DEFINE(PI_STATIC_AND_HIDDEN)
-fi
+AC_DEFINE(PI_STATIC_AND_HIDDEN)