[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r15314 - in /fsf/trunk/ports: ./ sysdeps/arm/elf/ sysdeps/arm/nptl/ sysdeps/mips/elf/ sysdeps/mips/nptl/ sysdeps/unix/sysv/l...
- To: commits@xxxxxxxxxx
- Subject: [commits] r15314 - in /fsf/trunk/ports: ./ sysdeps/arm/elf/ sysdeps/arm/nptl/ sysdeps/mips/elf/ sysdeps/mips/nptl/ sysdeps/unix/sysv/l...
- From: eglibc@xxxxxxxxxx
- Date: Wed, 14 Sep 2011 07:02:54 -0000
Author: eglibc
Date: Wed Sep 14 00:02:53 2011
New Revision: 15314
Log:
Import glibc-ports-mainline for 2011-09-14
Modified:
fsf/trunk/ports/ChangeLog.arm
fsf/trunk/ports/ChangeLog.mips
fsf/trunk/ports/sysdeps/arm/elf/configure
fsf/trunk/ports/sysdeps/arm/elf/configure.in
fsf/trunk/ports/sysdeps/arm/nptl/tls.h
fsf/trunk/ports/sysdeps/mips/elf/configure
fsf/trunk/ports/sysdeps/mips/elf/configure.in
fsf/trunk/ports/sysdeps/mips/nptl/tls.h
fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S
fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h
Modified: fsf/trunk/ports/ChangeLog.arm
==============================================================================
--- fsf/trunk/ports/ChangeLog.arm (original)
+++ fsf/trunk/ports/ChangeLog.arm Wed Sep 14 00:02:53 2011
@@ -1,3 +1,12 @@
+2011-09-13 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/arm/elf/configure.in: Always test for TLS support and
+ error out in case it is missing.
+ * sysdeps/arm/elf/configure: Regenerate.
+ * sysdeps/arm/nptl/tls.h,
+ sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S: Remove tests for
+ HAVE_TLS_SUPPORT.
+
2011-09-11 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* sysdeps/arm/dl-machine.h, sysdeps/arm/dl-tlsdesc.S,
Modified: fsf/trunk/ports/ChangeLog.mips
==============================================================================
--- fsf/trunk/ports/ChangeLog.mips (original)
+++ fsf/trunk/ports/ChangeLog.mips Wed Sep 14 00:02:53 2011
@@ -1,3 +1,15 @@
+2011-09-13 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/mips/bits/socket.h (__cmsg_nxthdr): Cast
+ return value to (struct cmsghdr *).
+
+2011-09-13 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/mips/elf/configure.in: Always test for TLS support and
+ error out in case it is missing.
+ * sysdeps/mips/elf/configure: Regenerate.
+ * sysdeps/mips/nptl/tls.h: Remove test for HAVE_TLS_SUPPORT.
+
2011-09-11 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* sysdeps/mips/dl-machine.h, sysdeps/mips/libc-tls.c,
Modified: fsf/trunk/ports/sysdeps/arm/elf/configure
==============================================================================
--- fsf/trunk/ports/sysdeps/arm/elf/configure (original)
+++ fsf/trunk/ports/sysdeps/arm/elf/configure Wed Sep 14 00:02:53 2011
@@ -1,13 +1,94 @@
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+else
+ as_basename=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+
+
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
+ sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
+ N
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ t loop
+ s/-\n.*//
+ ' >$as_me.lineno &&
+ chmod +x "$as_me.lineno" ||
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
+ # Exit status is that of the last command.
+ exit
+}
+
# This file is generated from configure.in by Autoconf. DO NOT EDIT!
# Local configure fragment for sysdeps/arm/elf.
-if test "$usetls" != no; then
# Check for support of thread-local storage handling in assembler and
# linker.
-echo "$as_me:$LINENO: checking for ARM TLS support" >&5
-echo $ECHO_N "checking for ARM TLS support... $ECHO_C" >&6
-if test "${libc_cv_arm_tls+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ARM TLS support" >&5
+$as_echo_n "checking for ARM TLS support... " >&6; }
+if ${libc_cv_arm_tls+:} false; then :
+ $as_echo_n "(cached) " >&6
else
cat > conftest.s <<\EOF
.section ".tdata", "awT", %progbits
@@ -21,25 +102,21 @@
.word foo(tlsgd)
EOF
if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
libc_cv_arm_tls=yes
else
libc_cv_arm_tls=no
fi
rm -f conftest*
fi
-echo "$as_me:$LINENO: result: $libc_cv_arm_tls" >&5
-echo "${ECHO_T}$libc_cv_arm_tls" >&6
-if test $libc_cv_arm_tls = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_TLS_SUPPORT 1
-_ACEOF
-
-fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_arm_tls" >&5
+$as_echo "$libc_cv_arm_tls" >&6; }
+if test $libc_cv_arm_tls = no; then
+ as_fn_error $? "the assembler must support TLS" "$LINENO" 5
fi
#AC_DEFINE(PI_STATIC_AND_HIDDEN)
Modified: fsf/trunk/ports/sysdeps/arm/elf/configure.in
==============================================================================
--- fsf/trunk/ports/sysdeps/arm/elf/configure.in (original)
+++ fsf/trunk/ports/sysdeps/arm/elf/configure.in Wed Sep 14 00:02:53 2011
@@ -1,7 +1,6 @@
GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
# Local configure fragment for sysdeps/arm/elf.
-if test "$usetls" != no; then
# Check for support of thread-local storage handling in assembler and
# linker.
AC_CACHE_CHECK(for ARM TLS support, libc_cv_arm_tls, [dnl
@@ -23,9 +22,8 @@
libc_cv_arm_tls=no
fi
rm -f conftest*])
-if test $libc_cv_arm_tls = yes; then
- AC_DEFINE(HAVE_TLS_SUPPORT)
-fi
+if test $libc_cv_arm_tls = no; then
+ AC_MSG_ERROR([the assembler must support TLS])
fi
dnl It is always possible to access static and hidden symbols in an
Modified: fsf/trunk/ports/sysdeps/arm/nptl/tls.h
==============================================================================
--- fsf/trunk/ports/sysdeps/arm/nptl/tls.h (original)
+++ fsf/trunk/ports/sysdeps/arm/nptl/tls.h Wed Sep 14 00:02:53 2011
@@ -42,11 +42,6 @@
# include <tcb-offsets.h>
#endif /* __ASSEMBLER__ */
-
-/* We require TLS support in the tools. */
-#ifndef HAVE_TLS_SUPPORT
-# error "TLS support is required."
-#endif
#ifndef __ASSEMBLER__
Modified: fsf/trunk/ports/sysdeps/mips/elf/configure
==============================================================================
--- fsf/trunk/ports/sysdeps/mips/elf/configure (original)
+++ fsf/trunk/ports/sysdeps/mips/elf/configure Wed Sep 14 00:02:53 2011
@@ -1,13 +1,94 @@
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+else
+ as_basename=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+
+
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
+ sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
+ N
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ t loop
+ s/-\n.*//
+ ' >$as_me.lineno &&
+ chmod +x "$as_me.lineno" ||
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
+ # Exit status is that of the last command.
+ exit
+}
+
# This file is generated from configure.in by Autoconf. DO NOT EDIT!
# Local configure fragment for sysdeps/mips/elf.
-if test "$usetls" != no; then
# Check for support of thread-local storage handling in assembler and
# linker.
-echo "$as_me:$LINENO: checking for MIPS TLS support" >&5
-echo $ECHO_N "checking for MIPS TLS support... $ECHO_C" >&6
-if test "${libc_cv_mips_tls+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MIPS TLS support" >&5
+$as_echo_n "checking for MIPS TLS support... " >&6; }
+if ${libc_cv_mips_tls+:} false; then :
+ $as_echo_n "(cached) " >&6
else
cat > conftest.s <<\EOF
.section ".tdata", "awT", %progbits
@@ -23,24 +104,20 @@
addiu $4, $28, %tlsgd(x)
EOF
if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
libc_cv_mips_tls=yes
else
libc_cv_mips_tls=no
fi
rm -f conftest*
fi
-echo "$as_me:$LINENO: result: $libc_cv_mips_tls" >&5
-echo "${ECHO_T}$libc_cv_mips_tls" >&6
-if test $libc_cv_mips_tls = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_TLS_SUPPORT 1
-_ACEOF
-
-fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_mips_tls" >&5
+$as_echo "$libc_cv_mips_tls" >&6; }
+if test $libc_cv_mips_tls = no; then
+ as_fn_error $? "the assembler must support TLS" "$LINENO" 5
fi
Modified: fsf/trunk/ports/sysdeps/mips/elf/configure.in
==============================================================================
--- fsf/trunk/ports/sysdeps/mips/elf/configure.in (original)
+++ fsf/trunk/ports/sysdeps/mips/elf/configure.in Wed Sep 14 00:02:53 2011
@@ -1,7 +1,6 @@
GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
# Local configure fragment for sysdeps/mips/elf.
-if test "$usetls" != no; then
# Check for support of thread-local storage handling in assembler and
# linker.
AC_CACHE_CHECK(for MIPS TLS support, libc_cv_mips_tls, [dnl
@@ -25,9 +24,8 @@
libc_cv_mips_tls=no
fi
rm -f conftest*])
-if test $libc_cv_mips_tls = yes; then
- AC_DEFINE(HAVE_TLS_SUPPORT)
-fi
+if test $libc_cv_mips_tls = no; then
+ AC_MSG_ERROR([the assembler must support TLS])
fi
dnl No MIPS GCC supports accessing static and hidden symbols in an
Modified: fsf/trunk/ports/sysdeps/mips/nptl/tls.h
==============================================================================
--- fsf/trunk/ports/sysdeps/mips/nptl/tls.h (original)
+++ fsf/trunk/ports/sysdeps/mips/nptl/tls.h Wed Sep 14 00:02:53 2011
@@ -55,11 +55,6 @@
.set pop
#endif /* __ASSEMBLER__ */
-
-/* We require TLS support in the tools. */
-#ifndef HAVE_TLS_SUPPORT
-# error "TLS support is required."
-#endif
#ifndef __ASSEMBLER__
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S Wed Sep 14 00:02:53 2011
@@ -35,8 +35,6 @@
#include <sysdep.h>
-#ifdef HAVE_TLS_SUPPORT
-
/* GCC will emit calls to this routine under -mtp=soft. Linux has an
equivalent helper function (which clobbers fewer registers than
a normal function call) in a high page of memory; tail call to the
@@ -47,5 +45,3 @@
mov r0, #0xffff0fff
sub pc, r0, #31
END (__aeabi_read_tp)
-
-#endif
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h Wed Sep 14 00:02:53 2011
@@ -312,7 +312,7 @@
{
if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr))
/* The kernel header does this so there may be a reason. */
- return 0;
+ return (struct cmsghdr *) 0;
__cmsg = (struct cmsghdr *) ((unsigned char *) __cmsg
+ CMSG_ALIGN (__cmsg->cmsg_len));
@@ -321,7 +321,7 @@
|| ((unsigned char *) __cmsg + CMSG_ALIGN (__cmsg->cmsg_len)
> ((unsigned char *) __mhdr->msg_control + __mhdr->msg_controllen)))
/* No more entries. */
- return 0;
+ return (struct cmsghdr *) 0;
return __cmsg;
}
#endif /* Use `extern inline'. */