summary refs log tree commit diff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-03-10 00:38:59 -0800
committerDavid S. Miller <davem@davemloft.net>2011-03-10 00:38:59 -0800
commit03592fc7ea512141f4c6f5f5f636d3b856563763 (patch)
tree9d8b46163844431b02d0f4d570db7708a4c4ec70
parent6a5ee1029b3966c5ae9adaaa881e255b2880f511 (diff)
downloadglibc-03592fc7ea512141f4c6f5f5f636d3b856563763.tar.gz
glibc-03592fc7ea512141f4c6f5f5f636d3b856563763.tar.xz
glibc-03592fc7ea512141f4c6f5f5f636d3b856563763.zip
sparc64: Relax tls linking test.
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/sparc/sparc64/elf/configure6
-rw-r--r--sysdeps/sparc/sparc64/elf/configure.in6
3 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f4750b1985..c8669a99fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/sysdeps/sparc/sparc64/elf/configure b/sysdeps/sparc/sparc64/elf/configure
index 2c9e29e6f6..f213438aa5 100644
--- a/sysdeps/sparc/sparc64/elf/configure
+++ b/sysdeps/sparc/sparc64/elf/configure
@@ -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)
@@ -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=$?
diff --git a/sysdeps/sparc/sparc64/elf/configure.in b/sysdeps/sparc/sparc64/elf/configure.in
index fd7e34e900..4f75978358 100644
--- a/sysdeps/sparc/sparc64/elf/configure.in
+++ b/sysdeps/sparc/sparc64/elf/configure.in
@@ -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)
@@ -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