From c80098a9a05b7d5f8ad1488135f2cee613998c50 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 21 Feb 2012 12:06:07 -0800 Subject: [PATCH] Add sparc configure checks for GOTDATA support. * config.h.in (HAVE_BINUTILS_GOTDATA): New. (HAVE_GCC_GOTDATA): New. * sysdeps/sparc/elf/configure.in: Test for GOTDATA relocation support in both binutils and gcc. * sysdeps/sparc/elf/configure: Regenerate. --- ChangeLog | 6 ++++ config.h.in | 6 ++++ sysdeps/sparc/elf/configure | 73 ++++++++++++++++++++++++++++++++++++++++++ sysdeps/sparc/elf/configure.in | 53 ++++++++++++++++++++++++++++++ 4 files changed, 138 insertions(+) diff --git a/ChangeLog b/ChangeLog index af25b40..6eb14f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2012-02-20 David S. Miller + * config.h.in (HAVE_BINUTILS_GOTDATA): New. + (HAVE_GCC_GOTDATA): New. + * sysdeps/sparc/elf/configure.in: Test for GOTDATA + relocation support in both binutils and gcc. + * sysdeps/sparc/elf/configure: Regenerate. + * sysdeps/sparc/sparc32/elf/configure.in: Delete. * sysdeps/sparc/sparc32/elf/configure: Delete. * sysdeps/sparc/sparc64/elf/configure.in: Delete. diff --git a/config.h.in b/config.h.in index 53c6823..b503454 100644 --- a/config.h.in +++ b/config.h.in @@ -87,6 +87,12 @@ certain registers (CR0, MQ, CTR, LR) in asm statements. */ #undef BROKEN_PPC_ASM_CR0 +/* Defined on SPARC if as and ld both support GOTDATA relocations. */ +#undef HAVE_BINUTILS_GOTDATA + +/* 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/elf/configure b/sysdeps/sparc/elf/configure index 78dc977..67a4039 100644 --- a/sysdeps/sparc/elf/configure +++ b/sysdeps/sparc/elf/configure @@ -136,3 +136,76 @@ $as_echo "$libc_cv_sparc_tls" >&6; } if test $libc_cv_sparc_tls = no; then as_fn_error $? "the assembler must support TLS" "$LINENO" 5 fi + +# Check for GOTDATA relocation support in assembler and linker. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sparc binutils GOTDATA reloc support" >&5 +$as_echo_n "checking for sparc binutils GOTDATA reloc support... " >&6; } +if ${libc_cv_sparc_gotdata+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat > conftest.S <<\EOF + .data + .globl data +data: .word 0 + .text + .globl foo +foo: sethi %gdop_hix22(data), %g1 + xor %g1, %gdop_lox10(data), %g1 +#ifdef __arch64__ + ldx [%l7 + %g1], %g1, %gdop(data) +#else + ld [%l7 + %g1], %g1, %gdop(data) +#endif +EOF +if { ac_try='${CC-cc} -c $CFLAGS conftest.S 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 + libc_cv_sparc_gotdata=yes +else + libc_cv_sparc_gotdata=no +fi +rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_sparc_gotdata" >&5 +$as_echo "$libc_cv_sparc_gotdata" >&6; } +if test $libc_cv_sparc_gotdata = yes; then + $as_echo "#define HAVE_BINUTILS_GOTDATA 1" >>confdefs.h + +fi + +# 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 diff --git a/sysdeps/sparc/elf/configure.in b/sysdeps/sparc/elf/configure.in index c22a7c5..ab8b189 100644 --- a/sysdeps/sparc/elf/configure.in +++ b/sysdeps/sparc/elf/configure.in @@ -45,3 +45,56 @@ rm -f conftest*]) if test $libc_cv_sparc_tls = no; then AC_MSG_ERROR([the assembler must support TLS]) fi + +# Check for GOTDATA relocation support in assembler and linker. +AC_CACHE_CHECK(for sparc binutils GOTDATA reloc support, libc_cv_sparc_gotdata, [dnl +changequote(,)dnl +cat > conftest.S <<\EOF + .data + .globl data +data: .word 0 + .text + .globl foo +foo: sethi %gdop_hix22(data), %g1 + xor %g1, %gdop_lox10(data), %g1 +#ifdef __arch64__ + ldx [%l7 + %g1], %g1, %gdop(data) +#else + ld [%l7 + %g1], %g1, %gdop(data) +#endif +EOF +changequote([,])dnl +dnl +if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.S 1>&AS_MESSAGE_LOG_FD); then + libc_cv_sparc_gotdata=yes +else + libc_cv_sparc_gotdata=no +fi +rm -f conftest*]) +if test $libc_cv_sparc_gotdata = yes; then + AC_DEFINE(HAVE_BINUTILS_GOTDATA) +fi + +# 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 -- 2.7.4