Skip to content

Commit

Permalink
sparc64: Relax tls linking test.
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Frysinger authored and David S. Miller committed Mar 10, 2011
1 parent 6a5ee10 commit 03592fc
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2011-03-10 Mike Frysinger <vapier@gentoo.org>

* sysdeps/sparc/sparc64/elf/configure.in (libc_cv_sparc64_tls): Add
$LDFLAGS and -nostdlib -nostartfiles to linking step. Change main
to _start.
* sysdeps/sparc/sparc64/elf/configure: Regenerate.

2011-03-06 Ulrich Drepper <drepper@gmail.com>

* elf/dl-load.c (_dl_map_object): If we are looking for the first
Expand Down
6 changes: 3 additions & 3 deletions sysdeps/sparc/sparc64/elf/configure
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ foo: .word 1
.globl bar
bar: .skip 4
.text
.globl main
main: sethi %tgd_hi22(foo), %l1
.globl _start
_start: sethi %tgd_hi22(foo), %l1
add %l1, %tgd_lo10(foo), %l1
add %l7, %l1, %o0, %tgd_add(foo)
call __tls_get_addr, %tgd_call(foo)
Expand All @@ -35,7 +35,7 @@ main: sethi %tgd_hi22(foo), %l1
sethi %tle_hix22(foo), %l1
xor %l1, %tle_lox10(foo), %l1
EOF
if { ac_try='${CC-cc} -o conftest.bin $CFLAGS conftest.s 1>&5'
if { ac_try='${CC-cc} -o conftest.bin $CFLAGS $LDFLAGS conftest.s -nostdlib -nostartfiles 1>&5'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
Expand Down
6 changes: 3 additions & 3 deletions sysdeps/sparc/sparc64/elf/configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ foo: .word 1
.globl bar
bar: .skip 4
.text
.globl main
main: sethi %tgd_hi22(foo), %l1
.globl _start
_start: sethi %tgd_hi22(foo), %l1
add %l1, %tgd_lo10(foo), %l1
add %l7, %l1, %o0, %tgd_add(foo)
call __tls_get_addr, %tgd_call(foo)
Expand All @@ -34,7 +34,7 @@ main: sethi %tgd_hi22(foo), %l1
EOF
changequote([,])dnl
dnl
if AC_TRY_COMMAND(${CC-cc} -o conftest.bin $CFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD); then
if AC_TRY_COMMAND(${CC-cc} -o conftest.bin $CFLAGS $LDFLAGS conftest.s -nostdlib -nostartfiles 1>&AS_MESSAGE_LOG_FD); then
libc_cv_sparc64_tls=yes
else
libc_cv_sparc64_tls=no
Expand Down

0 comments on commit 03592fc

Please sign in to comment.