Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
This commit is contained in:
commit
f6ce0f974b
@ -14,6 +14,12 @@
|
||||
|
||||
* elf/Makefile: Don't run tst-execstack* tests of SELinux is enabled.
|
||||
|
||||
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.
|
||||
|
||||
2011-03-06 Ulrich Drepper <drepper@gmail.com>
|
||||
|
||||
* elf/dl-load.c (_dl_map_object): If we are looking for the first
|
||||
|
6
sysdeps/sparc/sparc64/elf/configure
vendored
6
sysdeps/sparc/sparc64/elf/configure
vendored
@ -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=$?
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user