[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r21846 - in /fsf/trunk/libc: ./ elf/ include/ localedata/ localedata/locales/ nptl/ nptl/sysdeps/unix/sysv/linux/ ports/ por...
- To: commits@xxxxxxxxxx
- Subject: [Commits] r21846 - in /fsf/trunk/libc: ./ elf/ include/ localedata/ localedata/locales/ nptl/ nptl/sysdeps/unix/sysv/linux/ ports/ por...
- From: eglibc@xxxxxxxxxx
- Date: Thu, 22 Nov 2012 00:01:52 -0000
Author: eglibc
Date: Thu Nov 22 00:01:51 2012
New Revision: 21846
Log:
Import glibc-mainline for 2012-11-22
Added:
fsf/trunk/libc/localedata/locales/niu_NU
fsf/trunk/libc/localedata/locales/niu_NZ
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_frint.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_frintf.c
fsf/trunk/libc/ports/sysdeps/mips/sotruss-lib.c
Removed:
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_frint.x
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_frintf.x
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/NEWS
fsf/trunk/libc/aclocal.m4
fsf/trunk/libc/configure
fsf/trunk/libc/configure.in
fsf/trunk/libc/elf/elf.h
fsf/trunk/libc/elf/get-dynamic-info.h
fsf/trunk/libc/include/elf.h
fsf/trunk/libc/localedata/ChangeLog
fsf/trunk/libc/localedata/SUPPORTED
fsf/trunk/libc/localedata/locales/szl_PL
fsf/trunk/libc/nptl/ChangeLog
fsf/trunk/libc/nptl/pthread_cond_timedwait.c
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sem_post.c
fsf/trunk/libc/ports/ChangeLog.aarch64
fsf/trunk/libc/ports/ChangeLog.arm
fsf/trunk/libc/ports/ChangeLog.m68k
fsf/trunk/libc/ports/ChangeLog.mips
fsf/trunk/libc/ports/sysdeps/aarch64/dl-tlsdesc.S
fsf/trunk/libc/ports/sysdeps/aarch64/dl-tlsdesc.h
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_ceil.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_ceilf.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_floor.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_floorf.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fma.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fmaf.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fmax.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fmaxf.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fmin.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fminf.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_llrint.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_llrintf.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_llround.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_llroundf.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_lrint.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_lrintf.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_lround.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_lroundf.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_nearbyint.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_nearbyintf.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_rint.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_rintf.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_round.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_roundf.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_trunc.c
fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_truncf.c
fsf/trunk/libc/ports/sysdeps/aarch64/tlsdesc.c
fsf/trunk/libc/ports/sysdeps/arm/configure
fsf/trunk/libc/ports/sysdeps/arm/configure.in
fsf/trunk/libc/ports/sysdeps/arm/fesetenv.c
fsf/trunk/libc/ports/sysdeps/mips/jmpbuf-unwind.h
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/Makefile
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Nov 22 00:01:51 2012
@@ -1,3 +1,24 @@
+2012-11-21 H.J. Lu <hongjiu.lu@xxxxxxxxx>
+
+ [BZ #14865]
+ * aclocal.m4 (LIBC_LINKER_FEATURE): New macro.
+ * configure.in: Use LIBC_LINKER_FEATURE to check -z nodelete,
+ -z nodlopen, -z initfirst and -z execstack support.
+ * configure: Regenerated.
+
+ * elf/elf.h (DF_1_NODIRECT): New macro.
+ (DF_1_IGNMULDEF): Likewise.
+ (DF_1_NOKSYMS): Likewise.
+ (DF_1_NOHDR): Likewise.
+ (DF_1_EDITED): Likewise.
+ (DF_1_NORELOC): Likewise.
+ (DF_1_SYMINTPOSE): Likewise.
+ (DF_1_GLOBAUDIT): Likewise.
+ (DF_1_SINGLETON): Likewise.
+ * elf/get-dynamic-info.h (elf_get_dynamic_info): Assert
+ DT_1_SUPPORTED_MASK bits.
+ * include/elf.h (DT_1_SUPPORTED_MASK): New macro.
+
2012-11-20 Carlos O'Donell <carlos_odonell@xxxxxxxxxx>
* sysdeps/unix/make-syscalls.sh: Document prefixes.
Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Thu Nov 22 00:01:51 2012
@@ -21,7 +21,7 @@
14638, 14645, 14648, 14652, 14660, 14661, 14669, 14672, 14683, 14694,
14716, 14719, 14743, 14767, 14783, 14784, 14785, 14793, 14796, 14797,
14801, 14805, 14807, 14809, 14811, 14815, 14821, 14824, 14828, 14831,
- 14835, 14838, 14856.
+ 14835, 14838, 14856, 14863, 14865, 14866.
* Port to ARM AArch64 contributed by Linaro.
@@ -68,6 +68,9 @@
is not linked with -lrt) will no longer implicitly load the pthreads
library at runtime and so will not suffer the overheads associated with
multi-thread support in other code such as the C++ runtime library.
+
+* New locales: ayc_PE, doi_IN, mni_IN, nhn_MX, niu_NU, niu_NZ, sat_IN, and
+ szl_PL.
Version 2.16
Modified: fsf/trunk/libc/aclocal.m4
==============================================================================
--- fsf/trunk/libc/aclocal.m4 (original)
+++ fsf/trunk/libc/aclocal.m4 Thu Nov 22 00:01:51 2012
@@ -213,3 +213,31 @@
AC_SUBST(REPORT_BUGS_TO)
AC_SUBST(REPORT_BUGS_TEXI)
])
+
+dnl Check linker option support.
+dnl LIBC_LINKER_FEATURE([ld_option], [cc_option], [action-if-true], [action-if-false])
+AC_DEFUN([LIBC_LINKER_FEATURE],
+[AC_MSG_CHECKING([for linker that supports $1])
+libc_linker_feature=no
+if test x"$gnu_ld" = x"yes"; then
+ libc_linker_check=`$LD -v --help 2>/dev/null | grep "\$1"`
+ if test -n "$libc_linker_check"; then
+ cat > conftest.c <<EOF
+int _start (void) { return 42; }
+EOF
+ if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+ $2 -nostdlib -nostartfiles
+ -fPIC -shared -o conftest.so conftest.c
+ 1>&AS_MESSAGE_LOG_FD])
+ then
+ libc_linker_feature=yes
+ fi
+ rm -f conftest*
+ fi
+fi
+if test $libc_linker_feature = yes; then
+ $3
+else
+ $4
+fi
+AC_MSG_RESULT($libc_linker_feature)])
Modified: fsf/trunk/libc/configure
==============================================================================
--- fsf/trunk/libc/configure (original)
+++ fsf/trunk/libc/configure Thu Nov 22 00:01:51 2012
@@ -6235,86 +6235,101 @@
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -z nodelete option" >&5
-$as_echo_n "checking for -z nodelete option... " >&6; }
-if ${libc_cv_z_nodelete+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat > conftest.c <<EOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker that supports -z nodelete" >&5
+$as_echo_n "checking for linker that supports -z nodelete... " >&6; }
+libc_linker_feature=no
+if test x"$gnu_ld" = x"yes"; then
+ libc_linker_check=`$LD -v --help 2>/dev/null | grep "\-z nodelete"`
+ if test -n "$libc_linker_check"; then
+ cat > conftest.c <<EOF
int _start (void) { return 42; }
EOF
-if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
- -fPIC -shared -o conftest.so conftest.c
- -nostartfiles -nostdlib
- -Wl,--enable-new-dtags,-z,nodelete 1>&5'
+ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+ -Wl,--enable-new-dtags,-z,nodelete -nostdlib -nostartfiles
+ -fPIC -shared -o conftest.so 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
+ then
+ libc_linker_feature=yes
+ fi
+ rm -f conftest*
+ fi
+fi
+if test $libc_linker_feature = yes; then
libc_cv_z_nodelete=yes
else
as_fn_error $? "linker with -z nodelete support required" "$LINENO" 5
fi
-rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_z_nodelete" >&5
-$as_echo "$libc_cv_z_nodelete" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -z nodlopen option" >&5
-$as_echo_n "checking for -z nodlopen option... " >&6; }
-if ${libc_cv_z_nodlopen+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat > conftest.c <<EOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_linker_feature" >&5
+$as_echo "$libc_linker_feature" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker that supports -z nodlopen" >&5
+$as_echo_n "checking for linker that supports -z nodlopen... " >&6; }
+libc_linker_feature=no
+if test x"$gnu_ld" = x"yes"; then
+ libc_linker_check=`$LD -v --help 2>/dev/null | grep "\-z nodlopen"`
+ if test -n "$libc_linker_check"; then
+ cat > conftest.c <<EOF
int _start (void) { return 42; }
EOF
-if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
- -fPIC -shared -o conftest.so conftest.c
- -nostartfiles -nostdlib
- -Wl,--enable-new-dtags,-z,nodlopen 1>&5'
+ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+ -Wl,--enable-new-dtags,-z,nodlopen -nostdlib -nostartfiles
+ -fPIC -shared -o conftest.so 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
+ then
+ libc_linker_feature=yes
+ fi
+ rm -f conftest*
+ fi
+fi
+if test $libc_linker_feature = yes; then
libc_cv_z_nodlopen=yes
else
as_fn_error $? "linker with -z nodlopen support required" "$LINENO" 5
fi
-rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_z_nodlopen" >&5
-$as_echo "$libc_cv_z_nodlopen" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -z initfirst option" >&5
-$as_echo_n "checking for -z initfirst option... " >&6; }
-if ${libc_cv_z_initfirst+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat > conftest.c <<EOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_linker_feature" >&5
+$as_echo "$libc_linker_feature" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker that supports -z initfirst" >&5
+$as_echo_n "checking for linker that supports -z initfirst... " >&6; }
+libc_linker_feature=no
+if test x"$gnu_ld" = x"yes"; then
+ libc_linker_check=`$LD -v --help 2>/dev/null | grep "\-z initfirst"`
+ if test -n "$libc_linker_check"; then
+ cat > conftest.c <<EOF
int _start (void) { return 42; }
EOF
-if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
- -fPIC -shared -o conftest.so conftest.c
- -nostartfiles -nostdlib
- -Wl,--enable-new-dtags,-z,initfirst 1>&5'
+ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+ -Wl,--enable-new-dtags,-z,initfirst -nostdlib -nostartfiles
+ -fPIC -shared -o conftest.so 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
+ then
+ libc_linker_feature=yes
+ fi
+ rm -f conftest*
+ fi
+fi
+if test $libc_linker_feature = yes; then
libc_cv_z_initfirst=yes
else
as_fn_error $? "linker with -z initfirst support required" "$LINENO" 5
fi
-rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_z_initfirst" >&5
-$as_echo "$libc_cv_z_initfirst" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_linker_feature" >&5
+$as_echo "$libc_linker_feature" >&6; }
# Add-on fragments can set these for other machines.
libc_commonpagesize=${libc_commonpagesize:-no}
@@ -6511,32 +6526,37 @@
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -z execstack" >&5
-$as_echo_n "checking for -z execstack... " >&6; }
-if ${libc_cv_z_execstack+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat > conftest.c <<EOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker that supports -z execstack" >&5
+$as_echo_n "checking for linker that supports -z execstack... " >&6; }
+libc_linker_feature=no
+if test x"$gnu_ld" = x"yes"; then
+ libc_linker_check=`$LD -v --help 2>/dev/null | grep "\-z execstack"`
+ if test -n "$libc_linker_check"; then
+ cat > conftest.c <<EOF
int _start (void) { return 42; }
EOF
-if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
- -fPIC -shared -o conftest.so conftest.c
- -Wl,-z,execstack -nostdlib
- 1>&5'
+ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+ -Wl,-z,execstack -nostdlib -nostartfiles
+ -fPIC -shared -o conftest.so 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
+ then
+ libc_linker_feature=yes
+ fi
+ rm -f conftest*
+ fi
+fi
+if test $libc_linker_feature = yes; then
libc_cv_z_execstack=yes
else
libc_cv_z_execstack=no
fi
-rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_z_execstack" >&5
-$as_echo "$libc_cv_z_execstack" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_linker_feature" >&5
+$as_echo "$libc_linker_feature" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fpie" >&5
Modified: fsf/trunk/libc/configure.in
==============================================================================
--- fsf/trunk/libc/configure.in (original)
+++ fsf/trunk/libc/configure.in Thu Nov 22 00:01:51 2012
@@ -1409,53 +1409,17 @@
AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
fi
-AC_CACHE_CHECK(for -z nodelete option,
- libc_cv_z_nodelete, [dnl
-cat > conftest.c <<EOF
-int _start (void) { return 42; }
-EOF
-if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
- -fPIC -shared -o conftest.so conftest.c
- -nostartfiles -nostdlib
- -Wl,--enable-new-dtags,-z,nodelete 1>&AS_MESSAGE_LOG_FD])
-then
- libc_cv_z_nodelete=yes
-else
- AC_MSG_ERROR(linker with -z nodelete support required)
-fi
-rm -f conftest*])
-
-AC_CACHE_CHECK(for -z nodlopen option,
- libc_cv_z_nodlopen, [dnl
-cat > conftest.c <<EOF
-int _start (void) { return 42; }
-EOF
-if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
- -fPIC -shared -o conftest.so conftest.c
- -nostartfiles -nostdlib
- -Wl,--enable-new-dtags,-z,nodlopen 1>&AS_MESSAGE_LOG_FD])
-then
- libc_cv_z_nodlopen=yes
-else
- AC_MSG_ERROR(linker with -z nodlopen support required)
-fi
-rm -f conftest*])
-
-AC_CACHE_CHECK(for -z initfirst option,
- libc_cv_z_initfirst, [dnl
-cat > conftest.c <<EOF
-int _start (void) { return 42; }
-EOF
-if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
- -fPIC -shared -o conftest.so conftest.c
- -nostartfiles -nostdlib
- -Wl,--enable-new-dtags,-z,initfirst 1>&AS_MESSAGE_LOG_FD])
-then
- libc_cv_z_initfirst=yes
-else
- AC_MSG_ERROR(linker with -z initfirst support required)
-fi
-rm -f conftest*])
+LIBC_LINKER_FEATURE([-z nodelete], [-Wl,--enable-new-dtags,-z,nodelete],
+ [libc_cv_z_nodelete=yes],
+ [AC_MSG_ERROR(linker with -z nodelete support required)])
+
+LIBC_LINKER_FEATURE([-z nodlopen], [-Wl,--enable-new-dtags,-z,nodlopen],
+ [libc_cv_z_nodlopen=yes],
+ [AC_MSG_ERROR(linker with -z nodlopen support required)])
+
+LIBC_LINKER_FEATURE([-z initfirst], [-Wl,--enable-new-dtags,-z,initfirst],
+ [libc_cv_z_initfirst=yes],
+ [AC_MSG_ERROR(linker with -z initfirst support required)])
# Add-on fragments can set these for other machines.
libc_commonpagesize=${libc_commonpagesize:-no}
@@ -1593,21 +1557,8 @@
fi
AC_SUBST(libc_cv_z_combreloc)
-AC_CACHE_CHECK(for -z execstack,
- libc_cv_z_execstack, [dnl
-cat > conftest.c <<EOF
-int _start (void) { return 42; }
-EOF
-if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
- -fPIC -shared -o conftest.so conftest.c
- -Wl,-z,execstack -nostdlib
- 1>&AS_MESSAGE_LOG_FD])
-then
- libc_cv_z_execstack=yes
-else
- libc_cv_z_execstack=no
-fi
-rm -f conftest*])
+LIBC_LINKER_FEATURE([-z execstack], [-Wl,-z,execstack],
+ [libc_cv_z_execstack=yes], [libc_cv_z_execstack=no])
AC_SUBST(libc_cv_z_execstack)
AC_CACHE_CHECK(for -fpie, libc_cv_fpie, [dnl
Modified: fsf/trunk/libc/elf/elf.h
==============================================================================
--- fsf/trunk/libc/elf/elf.h (original)
+++ fsf/trunk/libc/elf/elf.h Thu Nov 22 00:01:51 2012
@@ -798,6 +798,15 @@
#define DF_1_ENDFILTEE 0x00004000 /* Filtee terminates filters search. */
#define DF_1_DISPRELDNE 0x00008000 /* Disp reloc applied at build time. */
#define DF_1_DISPRELPND 0x00010000 /* Disp reloc applied at run-time. */
+#define DF_1_NODIRECT 0x00020000 /* Object has no-direct binding. */
+#define DF_1_IGNMULDEF 0x00040000
+#define DF_1_NOKSYMS 0x00080000
+#define DF_1_NOHDR 0x00100000
+#define DF_1_EDITED 0x00200000 /* Object is modified after built. */
+#define DF_1_NORELOC 0x00400000
+#define DF_1_SYMINTPOSE 0x00800000 /* Object has individual interposers. */
+#define DF_1_GLOBAUDIT 0x01000000 /* Global auditin required. */
+#define DF_1_SINGLETON 0x02000000 /* Singleton symbols are used. */
/* Flags for the feature selection in DT_FEATURE_1. */
#define DTF_1_PARINIT 0x00000001
Modified: fsf/trunk/libc/elf/get-dynamic-info.h
==============================================================================
--- fsf/trunk/libc/elf/get-dynamic-info.h (original)
+++ fsf/trunk/libc/elf/get-dynamic-info.h Thu Nov 22 00:01:51 2012
@@ -151,6 +151,9 @@
{
l->l_flags_1 = info[VERSYMIDX (DT_FLAGS_1)]->d_un.d_val;
+ /* Only DT_1_SUPPORTED_MASK bits are allowed. */
+ assert ((l->l_flags_1 & ~DT_1_SUPPORTED_MASK) == 0);
+
if (l->l_flags_1 & DF_1_NOW)
info[DT_BIND_NOW] = info[VERSYMIDX (DT_FLAGS_1)];
}
Modified: fsf/trunk/libc/include/elf.h
==============================================================================
--- fsf/trunk/libc/include/elf.h (original)
+++ fsf/trunk/libc/include/elf.h Thu Nov 22 00:01:51 2012
@@ -3,4 +3,10 @@
/* Some information which is not meant for the public and therefore not
in <elf.h>. */
# include <dl-dtprocnum.h>
+# ifdef DT_1_SUPPORTED_MASK
+# error DT_1_SUPPORTED_MASK is defined!
+# endif
+# define DT_1_SUPPORTED_MASK \
+ (DF_1_NOW | DF_1_NODELETE | DF_1_INITFIRST | DF_1_NOOPEN \
+ | DF_1_ORIGIN | DF_1_NODEFLIB)
#endif
Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Thu Nov 22 00:01:51 2012
@@ -1,3 +1,20 @@
+2012-11-21 Andreas Jaeger <aj@xxxxxxx>
+
+ * locales/szl_PL (LC_COLLATE): Fix syntax error.
+
+ * SUPPORTED (SUPPORTED-LOCALES): Fix typo for ayc_PE entry.
+
+2012-11-21 Chris Leonard <cjl@xxxxxxxxxxxxx>
+
+ [BZ #14863]
+ * SUPPORTED: Add niu_NU and niu_NZ.
+ * locales/niu_NU: Add Niuean (Vagahau Niue) locale for Niue,
+ contributed by Chris Leonard <cjl@xxxxxxxxxxxxx> and Emani
+ Fakaotimanava-Lui <emani@xxxxxxx>.
+ * locales/niu_NZ: Add Niuean (Vagahau Niue) locale for New
+ Zealand, contributed by Chris Leonard <cjl@xxxxxxxxxxxxx> and Emani
+ Fakaotimanava-Lui <emani@xxxxxxx>.
+
2012-11-19 Eagle Burkut <eagle.burkut@xxxxxxxxx>
[BZ #13759]
Modified: fsf/trunk/libc/localedata/SUPPORTED
==============================================================================
--- fsf/trunk/libc/localedata/SUPPORTED (original)
+++ fsf/trunk/libc/localedata/SUPPORTED Thu Nov 22 00:01:51 2012
@@ -46,7 +46,7 @@
ar_TN/ISO-8859-6 \
ar_YE.UTF-8/UTF-8 \
ar_YE/ISO-8859-6 \
-ayc_PE/UFT-8 \
+ayc_PE/UTF-8 \
az_AZ/UTF-8 \
as_IN/UTF-8 \
ast_ES.UTF-8/UTF-8 \
@@ -312,6 +312,8 @@
nds_NL/UTF-8 \
ne_NP/UTF-8 \
nhn_MX/UTF-8 \
+niu_NU/UTF-8 \
+niu_NZ/UTF-8 \
nl_AW/UTF-8 \
nl_BE.UTF-8/UTF-8 \
nl_BE/ISO-8859-1 \
Added: fsf/trunk/libc/localedata/locales/niu_NU
==============================================================================
--- fsf/trunk/libc/localedata/locales/niu_NU (added)
+++ fsf/trunk/libc/localedata/locales/niu_NU Thu Nov 22 00:01:51 2012
@@ -1,0 +1,193 @@
+comment_char %
+escape_char /
+% Charset: UTF-8
+LC_IDENTIFICATION
+title "Niuean (Vagahau Niue) locale for Niue"
+source "RockET Systems"
+address "PO Box 229, Fatalupe, Alofi, Niue"
+contact "Emani Fakaotimanava-Lui"
+email "emani@xxxxxxx"
+tel "006834638"
+fax ""
+language "Vagahau Niue (Niuean)"
+territory "Niue"
+revision "1.0"
+date "2012-07-18"
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%localedef -i locales/niu_NU -c -f charmaps/UTF-8 ./NIU_NU.UTF-8
+%
+% Niuean, Vagahau Niue language locale for Niue
+%
+% Charset: UTF-8
+%
+% Niuean terms provided by Emani Fakaotimanava-Lui <emani@xxxxxxx>
+%
+% Prepared and contributed to glibc by Chris Leonard <cjl@xxxxxxxxxxxxx> and
+% Emani Fakaotimanava-Lui <emani@xxxxxxx>
+%
+% This locale data has been developed in collaboration between:
+% Sugar Labs, http://www.sugarlabs.org/
+% RockET Systems, http://rocketsystems.nu/
+%
+% with support from the Internet Society (ISOC)
+% http://pacific.scoop.co.nz/2012/06/internet-society-funds-niue-language-lifeline/
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+category "niu_NU:2012";LC_IDENTIFICATION
+category "niu_NU:2012";LC_CTYPE
+category "niu_NU:2012";LC_COLLATE
+category "niu_NU:2012";LC_TIME
+category "niu_NU:2012";LC_NUMERIC
+category "niu_NU:2012";LC_MONETARY
+category "niu_NU:2012";LC_PAPER
+category "niu_NU:2012";LC_MEASUREMENT
+category "niu_NU:2012";LC_MESSAGES
+category "niu_NU:2012";LC_NAME
+category "niu_NU:2012";LC_ADDRESS
+category "niu_NU:2012";LC_TELEPHONE
+END LC_IDENTIFICATION
+
+LC_CTYPE
+copy "i18n"
+
+translit_start
+include "translit_combining";""
+translit_end
+END LC_CTYPE
+
+LC_COLLATE
+copy "iso14651_t1"
+END LC_COLLATE
+
+LC_TIME
+
+% Ianuali, Fepuali, Masi, Apelila, Me, Iuni, Iulai, Aokuso, Sepetema,
+% Oketopa, Novema, Tesemo
+
+mon "<U0049><U0061><U006E><U0075><U0061><U006C><U0069>";/
+ "<U0046><U0065><U0070><U0075><U0061><U006C><U0069>";/
+ "<U004D><U0061><U0073><U0069>";/
+ "<U0041><U0070><U0065><U006C><U0069><U006C><U0061>";/
+ "<U004D><U0065>";/
+ "<U0049><U0075><U006E><U0069>";/
+ "<U0049><U0075><U006C><U0061><U0069>";/
+ "<U0041><U006F><U006B><U0075><U0073><U006F>";/
+ "<U0053><U0065><U0070><U0065><U0074><U0065><U006D><U0061>";/
+ "<U004F><U006B><U0065><U0074><U006F><U0070><U0061>";/
+ "<U004E><U006F><U0076><U0065><U006D><U0061>";/
+ "<U0054><U0065><U0073><U0065><U006D><U006F>"
+
+% Ian, Fep, Mas, Ape, Me, Iun, Iul, Aok, Sep, Oke, Nov, Tes
+abmon "<U0049><U0061><U006E>";/
+ "<U0046><U0065><U0070>";/
+ "<U004D><U0061><U0073>";/
+ "<U0041><U0070><U0065>";/
+ "<U004D><U0065>";/
+ "<U0049><U0075><U006E>";/
+ "<U0049><U0075><U006C>";/
+ "<U0041><U006F><U006B>";/
+ "<U0053><U0065><U0070>";/
+ "<U004F><U006B><U0065>";/
+ "<U004E><U006F><U0076>";/
+ "<U0054><U0065><U0073>"
+
+% Aho Tapu, Aho Gofua, Aho Ua, Aho Lotu, Aho Tuloto, Aho Falaile, Aho Faiumu
+day "<U0041><U0068><U006F><U0020><U0054><U0061><U0070><U0075>";/
+ "<U0041><U0068><U006F><U0020><U0047><U006F><U0066><U0075><U0061>";/
+ "<U0041><U0068><U006F><U0020><U0055><U0061>";/
+ "<U0041><U0068><U006F><U0020><U004C><U006F><U0074><U0075>";/
+ "<U0041><U0068><U006F><U0020><U0054><U0075><U006C><U006F><U0074><U006F>";/
+ "<U0041><U0068><U006F><U0020><U0046><U0061><U006C><U0061><U0069><U006C><U0065>";/
+ "<U0041><U0068><U006F><U0020><U0046><U0061><U0069><U0075><U006D><U0075>"
+
+% Tapu, Gofua, Ua, Lotu, Tuloto, Falaile, Faiumu
+abday "<U0054><U0061><U0070><U0075>";/
+ "<U0047><U006F><U0066><U0075><U0061>";/
+ "<U0055><U0061>";/
+ "<U004C><U006F><U0074><U0075>";/
+ "<U0054><U0075><U006C><U006F><U0074><U006F>";/
+ "<U0046><U0061><U006C><U0061><U0069><U006C><U0065>";/
+ "<U0046><U0061><U0069><U0075><U006D><U0075>"
+
+% Abbreviated date and time representation to be referenced by the "%c" field descriptor -
+%
+% "%a" (short weekday name),
+% "%d" (day of month as a decimal number),
+% "%b" (short month name),
+% "%Y" (year with century as a decimal number),
+% "%T" (24-hour clock time in format HH:MM:SS),
+% "%Z" (Time zone name)
+% %a %d %b %Y %T %Z
+d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
+
+% Date representation to be referenced by the "%x" field descriptor -
+% "%d/%m/%Y", day/month/year as decimal numbers (01/01/2000).
+d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
+
+% Time representation to be referenced by the "%X" field descriptor -
+% "%T" (24-hour clock time in format HH:MM:SS)
+t_fmt "<U0025><U0054>"
+
+am_pm "<U0041><U004D>";"<U0050><U004D>"
+t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0025><U0070>"
+
+END LC_TIME
+
+LC_NUMERIC
+copy "en_NZ"
+END LC_NUMERIC
+
+LC_MONETARY
+copy "en_NZ"
+END LC_MONETARY
+
+LC_PAPER
+copy "en_NZ"
+END LC_PAPER
+
+LC_MEASUREMENT
+measurement 1
+END LC_MEASUREMENT
+
+LC_MESSAGES
+
+% ^[ÃÂÃÂ].*
+yesexpr "<U005E><U005B><U0113><U0112><U0079><U0059><U005D><U002E><U002A>"
+
+% ^[nN].*
+noexpr "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
+
+% Talia
+yesstr "<U0054><U0061><U006C><U0069><U0061>"
+
+% Nakai
+nostr "<U004E><U0061><U006B><U0061><U0069>"
+
+END LC_MESSAGES
+
+LC_NAME
+copy "en_NZ"
+END LC_NAME
+
+LC_ADDRESS
+% %f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N
+postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E><U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073><U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025><U004E><U0025><U007A><U0020><U0025><U0054><U0025><U004E><U0025><U0063><U0025><U004E>"
+% NU
+country_post "<U004E><U0055>"
+% NU
+country_ab2 "<U004E><U0055>"
+% NIU
+country_ab3 "<U004E><U0049><U0055>"
+country_num 570
+% niu
+lang_term "<U006E><U0069><U0075>"
+END LC_ADDRESS
+
+LC_TELEPHONE
+% +%c %a %l
+tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025><U006C>"
+% 683
+int_prefix "<U0036><U0038><U0033>"
+END LC_TELEPHONE
Added: fsf/trunk/libc/localedata/locales/niu_NZ
==============================================================================
--- fsf/trunk/libc/localedata/locales/niu_NZ (added)
+++ fsf/trunk/libc/localedata/locales/niu_NZ Thu Nov 22 00:01:51 2012
@@ -1,0 +1,190 @@
+comment_char %
+escape_char /
+% Charset: UTF-8
+LC_IDENTIFICATION
+title "Niuean (Vagahau Niue) locale for New Zealand"
+source "RockET Systems"
+address "PO Box 229, Fatalupe, Alofi, Niue"
+contact "Emani Fakaotimanava-Lui"
+email "emani@xxxxxxx"
+tel "006834638"
+fax ""
+language "Vagahau Niue (Niuean)"
+territory "New Zealand"
+revision "1.0"
+date "2012-07-18"
+% This file is distributed under the same license as the glibc package.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Niuean, Vagahau Niue language locale for New Zealand
+%
+% Charset: UTF-8
+%
+% Niuean terms provided by Emani Fakaotimanava-Lui <emani@xxxxxxx>
+%
+% Prepared and contributed to glibc by Chris Leonard <cjl@xxxxxxxxxxxxx> and
+% Emani Fakaotimanava-Lui <emani@xxxxxxx>
+%
+% This locale data has been developed in collaboration between:
+% Sugar Labs, http://www.sugarlabs.org/
+% RockET Systems, http://rocketsystems.nu/
+%
+% with support from the Internet Society (ISOC)
+% http://pacific.scoop.co.nz/2012/06/internet-society-funds-niue-language-lifeline/
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+category "niu_NZ:2012";LC_IDENTIFICATION
+category "niu_NZ:2012";LC_CTYPE
+category "niu_NZ:2012";LC_COLLATE
+category "niu_NZ:2012";LC_TIME
+category "niu_NZ:2012";LC_NUMERIC
+category "niu_NZ:2012";LC_MONETARY
+category "niu_NZ:2012";LC_PAPER
+category "niu_NZ:2012";LC_MEASUREMENT
+category "niu_NZ:2012";LC_MESSAGES
+category "niu_NZ:2012";LC_NAME
+category "niu_NZ:2012";LC_ADDRESS
+category "niu_NZ:2012";LC_TELEPHONE
+END LC_IDENTIFICATION
+
+LC_CTYPE
+copy "i18n"
+
+translit_start
+include "translit_combining";""
+translit_end
+END LC_CTYPE
+
+LC_COLLATE
+copy "iso14651_t1"
+END LC_COLLATE
+
+
+LC_TIME
+
+% Ianuali, Fepuali, Masi, Apelila, Me, Iuni, Iulai, Aokuso, Sepetema,
+% Oketopa, Novema, Tesemo
+mon "<U0049><U0061><U006E><U0075><U0061><U006C><U0069>";/
+ "<U0046><U0065><U0070><U0075><U0061><U006C><U0069>";/
+ "<U004D><U0061><U0073><U0069>";/
+ "<U0041><U0070><U0065><U006C><U0069><U006C><U0061>";/
+ "<U004D><U0065>";/
+ "<U0049><U0075><U006E><U0069>";/
+ "<U0049><U0075><U006C><U0061><U0069>";/
+ "<U0041><U006F><U006B><U0075><U0073><U006F>";/
+ "<U0053><U0065><U0070><U0065><U0074><U0065><U006D><U0061>";/
+ "<U004F><U006B><U0065><U0074><U006F><U0070><U0061>";/
+ "<U004E><U006F><U0076><U0065><U006D><U0061>";/
+ "<U0054><U0065><U0073><U0065><U006D><U006F>"
+
+% Ian, Fep, Mas, Ape, Me, Iun, Iul, Aok, Sep, Oke, Nov, Tes
+abmon "<U0049><U0061><U006E>";/
+ "<U0046><U0065><U0070>";/
+ "<U004D><U0061><U0073>";/
+ "<U0041><U0070><U0065>";/
+ "<U004D><U0065>";/
+ "<U0049><U0075><U006E>";/
+ "<U0049><U0075><U006C>";/
+ "<U0041><U006F><U006B>";/
+ "<U0053><U0065><U0070>";/
+ "<U004F><U006B><U0065>";/
+ "<U004E><U006F><U0076>";/
+ "<U0054><U0065><U0073>"
+
+% Aho Tapu, Aho Gofua, Aho Ua, Aho Lotu, Aho Tuloto, Aho Falaile, Aho Faiumu
+day "<U0041><U0068><U006F><U0020><U0054><U0061><U0070><U0075>";/
+ "<U0041><U0068><U006F><U0020><U0047><U006F><U0066><U0075><U0061>";/
+ "<U0041><U0068><U006F><U0020><U0055><U0061>";/
+ "<U0041><U0068><U006F><U0020><U004C><U006F><U0074><U0075>";/
+ "<U0041><U0068><U006F><U0020><U0054><U0075><U006C><U006F><U0074><U006F>";/
+ "<U0041><U0068><U006F><U0020><U0046><U0061><U006C><U0061><U0069><U006C><U0065>";/
+ "<U0041><U0068><U006F><U0020><U0046><U0061><U0069><U0075><U006D><U0075>"
+
+% Tapu, Gofua, Ua, Lotu, Tuloto, Falaile, Faiumu
+abday "<U0054><U0061><U0070><U0075>";/
+ "<U0047><U006F><U0066><U0075><U0061>";/
+ "<U0055><U0061>";/
+ "<U004C><U006F><U0074><U0075>";/
+ "<U0054><U0075><U006C><U006F><U0074><U006F>";/
+ "<U0046><U0061><U006C><U0061><U0069><U006C><U0065>";/
+ "<U0046><U0061><U0069><U0075><U006D><U0075>"
+
+% Abbreviated date and time representation to be referenced by the "%c" field descriptor -
+%
+% "%a" (short weekday name),
+% "%d" (day of month as a decimal number),
+% "%b" (short month name),
+% "%Y" (year with century as a decimal number),
+% "%T" (24-hour clock time in format HH:MM:SS),
+% "%Z" (Time zone name)
+% %a %d %b %Y %T %Z
+d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
+
+% Date representation to be referenced by the "%x" field descriptor -
+% "%d/%m/%Y", day/month/year as decimal numbers (01/01/2000).
+d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
+
+% Time representation to be referenced by the "%X" field descriptor -
+% "%T" (24-hour clock time in format HH:MM:SS)
+t_fmt "<U0025><U0054>"
+
+am_pm "<U0041><U004D>";"<U0050><U004D>"
+t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0025><U0070>"
+
+END LC_TIME
+
+LC_NUMERIC
+copy "en_NZ"
+END LC_NUMERIC
+
+LC_MONETARY
+copy "en_NZ"
+END LC_MONETARY
+
+LC_PAPER
+copy "en_NZ"
+END LC_PAPER
+
+LC_MEASUREMENT
+measurement 1
+END LC_MEASUREMENT
+
+LC_MESSAGES
+
+% ^[ÃÂÃÂ].*
+yesexpr "<U005E><U005B><U0113><U0112><U0079><U0059><U005D><U002E><U002A>"
+
+% ^[nN].*
+noexpr "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
+
+% Talia
+yesstr "<U0054><U0061><U006C><U0069><U0061>"
+
+% Nakai
+nostr "<U004E><U0061><U006B><U0061><U0069>"
+
+END LC_MESSAGES
+
+
+LC_NAME
+copy "en_NZ"
+END LC_NAME
+
+LC_ADDRESS
+% %f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N
+postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E><U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073><U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025><U004E><U0025><U007A><U0020><U0025><U0054><U0025><U004E><U0025><U0063><U0025><U004E>"
+% NZ
+country_ab2 "<U004E><U005A>"
+% NZL
+country_ab3 "<U004E><U005A><U004C>"
+country_num 554
+% niu
+lang_term "<U006E><U0069><U0075>"
+END LC_ADDRESS
+
+LC_TELEPHONE
+copy "en_NZ"
+END LC_TELEPHONE
Modified: fsf/trunk/libc/localedata/locales/szl_PL
==============================================================================
--- fsf/trunk/libc/localedata/locales/szl_PL (original)
+++ fsf/trunk/libc/localedata/locales/szl_PL Thu Nov 22 00:01:51 2012
@@ -62,7 +62,7 @@
collating-symbol <otilde>
collating-symbol <omacron>
collating-symbol <ocircumflex>
-collating-symbol <U014F>
+collating-symbol <U_014F>
collating-symbol <zacute>
collating-symbol <zdot>
Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Thu Nov 22 00:01:51 2012
@@ -1,3 +1,13 @@
+2012-11-21 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/sem_post.c (__old_sem_post): Cast result
+ of atomic_increment_val to (void) instead of storing in
+ otherwise-unused variable.
+
+ * pthread_cond_timedwait.c (__pthread_cond_timedwait)
+ [__NR_clock_gettime]: Cast result of INTERNAL_VSYSCALL to void
+ instead of storing in otherwise-unused variable.
+
2012-11-14 Marcus Shawcroft <marcus.shawcroft@xxxxxxxxxx>
* Makefile (CFLAGS-open.c, CFLAGS-open64.c, CFLAGS-pause.c)
Modified: fsf/trunk/libc/nptl/pthread_cond_timedwait.c
==============================================================================
--- fsf/trunk/libc/nptl/pthread_cond_timedwait.c (original)
+++ fsf/trunk/libc/nptl/pthread_cond_timedwait.c Thu Nov 22 00:01:51 2012
@@ -115,11 +115,10 @@
{
# ifdef __NR_clock_gettime
INTERNAL_SYSCALL_DECL (err);
- int ret;
- ret = INTERNAL_VSYSCALL (clock_gettime, err, 2,
- (cond->__data.__nwaiters
- & ((1 << COND_NWAITERS_SHIFT) - 1)),
- &rt);
+ (void) INTERNAL_VSYSCALL (clock_gettime, err, 2,
+ (cond->__data.__nwaiters
+ & ((1 << COND_NWAITERS_SHIFT) - 1)),
+ &rt);
/* Convert the absolute timeout value to a relative timeout. */
rt.tv_sec = abstime->tv_sec - rt.tv_sec;
rt.tv_nsec = abstime->tv_nsec - rt.tv_nsec;
Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sem_post.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sem_post.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sem_post.c Thu Nov 22 00:01:51 2012
@@ -65,7 +65,7 @@
{
int *futex = (int *) sem;
- int nr = atomic_increment_val (futex);
+ (void) atomic_increment_val (futex);
/* We always have to assume it is a shared semaphore. */
int err = lll_futex_wake (futex, 1, LLL_SHARED);
if (__builtin_expect (err, 0) < 0)
Modified: fsf/trunk/libc/ports/ChangeLog.aarch64
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.aarch64 (original)
+++ fsf/trunk/libc/ports/ChangeLog.aarch64 Thu Nov 22 00:01:51 2012
@@ -1,3 +1,94 @@
+2012-11-21 Marcus Shawcroft <marcus.shawcroft@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h
+ (lll_futex_timed_wait_bitset): Remove INTERNAL_SYSCALL_ERROR_P.
+
+2012-11-20 Marcus Shawcroft <marcus.shawcroft@xxxxxxxxxx>
+
+ * sysdeps/aarch64/fpu/s_fma.c (weak_alias_x):
+ Remove and switch to weak_alias.
+ * sysdeps/aarch64/fpu/s_fmin.c (weak_alias_x): Likewise.
+ * sysdeps/aarch64/fpu/s_frint.c (weak_alias_x): Likewise.
+ * sysdeps/aarch64/fpu/s_lrint.c (weak_alias_x): Likewise.
+ * sysdeps/aarch64/fpu/s_lround.c (weak_alias_x): Likewise.
+
+2012-11-20 Marcus Shawcroft <marcus.shawcroft@xxxxxxxxxx>
+
+ * sysdeps/aarch64/fpu/s_fma.c (strong_aliasx, NO_LONG_DOUBLE): Remove.
+ * sysdeps/aarch64/fpu/s_fmin.c (strong_aliasx, NO_LONG_DOUBLE): Likewise.
+ * sysdeps/aarch64/fpu/s_frint.c (strong_aliasx, NO_LONG_DOUBLE): Likewise.
+ * sysdeps/aarch64/fpu/s_lrint.c (strong_aliasx, NO_LONG_DOUBLE): Likewise.
+ * sysdeps/aarch64/fpu/s_lround.c (strong_aliasx, NO_LONG_DOUBLE): Likewise.
+
+2012-11-20 Marcus Shawcroft <marcus.shawcroft@xxxxxxxxxx>
+
+ * sysdeps/aarch64/fpu/s_fma.c: Indent preprocessor directives.
+ * sysdeps/aarch64/fpu/s_fmin.c: Likewise.
+ * sysdeps/aarch64/fpu/s_frint.c: Likewise.
+ * sysdeps/aarch64/fpu/s_frintf.c: Likewise.
+ * sysdeps/aarch64/fpu/s_lrint.c: Likewise.
+ * sysdeps/aarch64/fpu/s_lround.c: Likewise.
+
+2012-11-20 Marcus Shawcroft <marcus.shawcroft@xxxxxxxxxx>
+
+ * sysdeps/aarch64/dl-tlsdesc.S: Use range for copyright years.
+ * sysdeps/aarch64/dl-tlsdesc.h: Likewise.
+ * sysdeps/aarch64/tlsdesc.c: Likewise.
+ * sysdeps/aarch64/fpu/s_ceil.c: Likewise.
+ * sysdeps/aarch64/fpu/s_ceilf.c: Likewise.
+ * sysdeps/aarch64/fpu/s_floor.c: Likewise.
+ * sysdeps/aarch64/fpu/s_floorf.c: Likewise.
+ * sysdeps/aarch64/fpu/s_fmaf.c: Likewise.
+ * sysdeps/aarch64/fpu/s_fmax.c: Likewise.
+ * sysdeps/aarch64/fpu/s_fmaxf.c: Likewise.
+ * sysdeps/aarch64/fpu/s_fmin.c: Likewise.
+ * sysdeps/aarch64/fpu/s_fminf.c: Likewise.
+ * sysdeps/aarch64/fpu/s_frint.c: Likewise.
+ * sysdeps/aarch64/fpu/s_frintf.c: Likewise.
+ * sysdeps/aarch64/fpu/s_llrint.c: Likewise.
+ * sysdeps/aarch64/fpu/s_llrintf.c: Likewise.
+ * sysdeps/aarch64/fpu/s_llround.c: Likewise.
+ * sysdeps/aarch64/fpu/s_llroundf.c: Likewise.
+ * sysdeps/aarch64/fpu/s_lrint.c: Likewise.
+ * sysdeps/aarch64/fpu/s_lrintf.c: Likewise.
+ * sysdeps/aarch64/fpu/s_lround.c: Likewise.
+ * sysdeps/aarch64/fpu/s_lroundf.c: Likewise.
+ * sysdeps/aarch64/fpu/s_nearbyint.c: Likewise.
+ * sysdeps/aarch64/fpu/s_nearbyintf.c: Likewise.
+ * sysdeps/aarch64/fpu/s_rint.c: Likewise.
+ * sysdeps/aarch64/fpu/s_rintf.c: Likewise.
+ * sysdeps/aarch64/fpu/s_round.c: Likewise.
+ * sysdeps/aarch64/fpu/s_roundf.c: Likewise.
+ * sysdeps/aarch64/fpu/s_trunc.c: Likewise.
+ * sysdeps/aarch64/fpu/s_truncf.c: Likewise.
+
+2012-11-20 Marcus Shawcroft <marcus.shawcroft@xxxxxxxxxx>
+
+ * sysdeps/aarch64/fpu/s_frint.x: Renamed to...
+ * sysdeps/aarch64/fpu/s_frint.c: ... this new file.
+ * sysdeps/aarch64/fpu/s_frintf.x: Renamed to...
+ * sysdeps/aarch64/fpu/s_frintf.c: ... this new file.
+ * sysdeps/aarch64/fpu/s_ceil.c: Include s_frint.c.
+ * sysdeps/aarch64/fpu/s_floor.c: Likewise.
+ * sysdeps/aarch64/fpu/s_nearbyint.c: Likewise.
+ * sysdeps/aarch64/fpu/s_rint.c: Likewise.
+ * sysdeps/aarch64/fpu/s_round.c: Likewise.
+ * sysdeps/aarch64/fpu/s_trunc.c: Likewise.
+ * sysdeps/aarch64/fpu/s_ceilf.c: Include s_frintf.c.
+ * sysdeps/aarch64/fpu/s_floorf.c: Likewise.
+ * sysdeps/aarch64/fpu/s_nearbyintf.c: Likewise.
+ * sysdeps/aarch64/fpu/s_rintf.c: Likewise.
+ * sysdeps/aarch64/fpu/s_roundf.c: Likewise.
+ * sysdeps/aarch64/fpu/s_truncf.c: Likewise.
+
+2012-11-20 Marcus Shawcroft <marcus.shawcroft@xxxxxxxxxx>
+
+ * sysdeps/aarch64/fpu/s_fma.c (__CONCATX): Don't use K&R.
+ * sysdeps/aarch64/fpu/s_fmin.c (__CONCATX): Likewise.
+ * sysdeps/aarch64/fpu/s_lrint.c (__CONCATX): Likewise.
+ * sysdeps/aarch64/fpu/s_lround.c (__CONCATX): Likewise.
+ * sysdeps/aarch64/fpu/s_frint.x (__CONCATX): Likewise.
+
2012-11-19 Marcus Shawcroft <marcus.shawcroft@xxxxxxxxxx>
* sysdeps/aarch64/fpu/s_ceil.c: New file.
Modified: fsf/trunk/libc/ports/ChangeLog.arm
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.arm (original)
+++ fsf/trunk/libc/ports/ChangeLog.arm Thu Nov 22 00:01:51 2012
@@ -1,3 +1,16 @@
+2012-11-21 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/arm/configure.in: Generate default-abi.make with
+ definition of default-abi.
+ * sysdeps/arm/configure: Regenerated.
+ * sysdeps/unix/sysv/linux/arm/Makefile (default-abi-prog): Remove.
+ (default-abi): Likewise.
+ ($(common-objpfx)default-abi.make): Include.
+
+ [BZ #14866]
+ * sysdeps/arm/fesetenv.c (__fesetenv): Test whether bits for
+ trapping exceptions were successfully set for FE_NOMASK_ENV.
+
2012-11-14 Marcus Shawcroft <marcus.shawcroft@xxxxxxxxxx>
* sysdeps/unix/sysv/linux/arm/Makefile (libcrypt-sysdep_routines): Add
Modified: fsf/trunk/libc/ports/ChangeLog.m68k
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.m68k (original)
+++ fsf/trunk/libc/ports/ChangeLog.m68k Thu Nov 22 00:01:51 2012
@@ -1,3 +1,9 @@
+2012-11-21 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
+ (lll_futex_timed_wait_bitset): Remove use of
+ INTERNAL_SYSCALL_ERROR_P.
+
2012-11-20 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
* sysdeps/m68k/m680x0/fpu/s_atan.c (weak_aliasx): Remove
Modified: fsf/trunk/libc/ports/ChangeLog.mips
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.mips (original)
+++ fsf/trunk/libc/ports/ChangeLog.mips Thu Nov 22 00:01:51 2012
@@ -1,3 +1,10 @@
+2012-11-21 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/mips/jmpbuf-unwind.h (_jmpbuf_sp): Cast regs[0].__sp to
+ uintptr_t.
+
+ * sysdeps/mips/sotruss-lib.c: New file.
+
2012-11-20 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* sysdeps/unix/sysv/linux/mips/mips32/sysdep.h
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/dl-tlsdesc.S
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/dl-tlsdesc.S (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/dl-tlsdesc.S Thu Nov 22 00:01:51 2012
@@ -1,6 +1,6 @@
/* Thread-local storage handling in the ELF dynamic linker.
AArch64 version.
- Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+ Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/dl-tlsdesc.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/dl-tlsdesc.h (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/dl-tlsdesc.h Thu Nov 22 00:01:51 2012
@@ -1,6 +1,6 @@
/* Thread-local storage descriptor handling in the ELF dynamic linker.
AArch64 version.
- Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+ Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_ceil.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_ceil.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_ceil.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -18,4 +18,4 @@
#define FUNC ceil
#define INSN "frintp"
-#include <s_frint.x>
+#include <s_frint.c>
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_ceilf.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_ceilf.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_ceilf.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -18,4 +18,4 @@
#define FUNC ceilf
#define INSN "frintp"
-#include <s_frintf.x>
+#include <s_frintf.c>
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_floor.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_floor.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_floor.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -18,4 +18,4 @@
#define FUNC floor
#define INSN "frintm"
-#include <s_frint.x>
+#include <s_frint.c>
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_floorf.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_floorf.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_floorf.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -18,4 +18,4 @@
#define FUNC floorf
#define INSN "frintm"
-#include <s_frintf.x>
+#include <s_frintf.c>
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fma.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fma.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fma.c Thu Nov 22 00:01:51 2012
@@ -19,25 +19,22 @@
#include <math.h>
#ifndef FUNC
-#define FUNC fma
+# define FUNC fma
#endif
#ifndef TYPE
-#define TYPE double
-#define REGS "d"
+# define TYPE double
+# define REGS "d"
#else
-#ifndef REGS
-#error REGS not defined
-#endif
+# ifndef REGS
+# error REGS not defined
+# endif
#endif
#define __CONCATX(a,b) __CONCAT(a,b)
TYPE
-__CONCATX(__,FUNC) (x, y, z)
- TYPE x;
- TYPE y;
- TYPE z;
+__CONCATX(__,FUNC) (TYPE x, TYPE y, TYPE z)
{
TYPE result;
asm ( "fmadd" "\t%" REGS "0, %" REGS "1, %" REGS "2, %" REGS "3"
@@ -45,10 +42,4 @@
return result;
}
-#define weak_aliasx(a,b) weak_alias(a,b)
-weak_aliasx (__CONCATX(__,FUNC), FUNC)
-#define strong_aliasx(a,b) strong_alias(a,b)
-#ifdef NO_LONG_DOUBLE
-strong_aliasx (__CONCATX(__,FUNC), __CONCATX(__,__CONCATX(FUNC,l)))
-weak_aliasx (__CONCATX(__,FUNC), __CONCATX(FUNC,l))
-#endif
+weak_alias (__CONCATX(__,FUNC), FUNC)
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fmaf.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fmaf.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fmaf.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fmax.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fmax.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fmax.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fmaxf.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fmaxf.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fmaxf.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fmin.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fmin.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fmin.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -19,28 +19,26 @@
#include <math.h>
#ifndef FUNC
-#define FUNC fmin
+# define FUNC fmin
#endif
#ifndef INSN
-#define INSN "fminnm"
+# define INSN "fminnm"
#endif
#ifndef TYPE
-#define TYPE double
-#define REGS "d"
+# define TYPE double
+# define REGS "d"
#else
-#ifndef REGS
-#error REGS not defined
-#endif
+# ifndef REGS
+# error REGS not defined
+# endif
#endif
#define __CONCATX(a,b) __CONCAT(a,b)
TYPE
-__CONCATX(__,FUNC) (x, y)
- TYPE x;
- TYPE y;
+__CONCATX(__,FUNC) (TYPE x, TYPE y)
{
TYPE result;
asm ( INSN "\t%" REGS "0, %" REGS "1, %" REGS "2"
@@ -48,10 +46,4 @@
return result;
}
-#define weak_aliasx(a,b) weak_alias(a,b)
-weak_aliasx (__CONCATX(__,FUNC), FUNC)
-#define strong_aliasx(a,b) strong_alias(a,b)
-#ifdef NO_LONG_DOUBLE
-strong_aliasx (__CONCATX(__,FUNC), __CONCATX(__,__CONCATX(FUNC,l)))
-weak_aliasx (__CONCATX(__,FUNC), __CONCATX(FUNC,l))
-#endif
+weak_alias (__CONCATX(__,FUNC), FUNC)
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fminf.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fminf.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_fminf.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Added: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_frint.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_frint.c (added)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_frint.c Thu Nov 22 00:01:51 2012
@@ -1,0 +1,49 @@
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
+
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <math.h>
+
+#ifndef FUNC
+# error FUNC not defined
+#endif
+
+#ifndef TYPE
+# define TYPE double
+# define REGS "d"
+#else
+# ifndef REGS
+# error REGS not defined
+# endif
+#endif
+
+#ifndef INSN
+# error INSN not defined
+#endif
+
+#define __CONCATX(a,b) __CONCAT(a,b)
+
+TYPE
+__CONCATX(__,FUNC) (TYPE x)
+{
+ TYPE result;
+ asm ( INSN "\t%" REGS "0, %" REGS "1" :
+ "=w" (result) : "w" (x) );
+ return result;
+}
+
+weak_alias (__CONCATX(__,FUNC), FUNC)
Removed: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_frint.x
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_frint.x (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_frint.x (removed)
@@ -1,56 +1,0 @@
-/* Copyright (C) 1996, 1997, 2011, 2012 Free Software Foundation, Inc.
-
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#include <math.h>
-
-#ifndef FUNC
-#error FUNC not defined
-#endif
-
-#ifndef TYPE
-#define TYPE double
-#define REGS "d"
-#else
-#ifndef REGS
-#error REGS not defined
-#endif
-#endif
-
-#ifndef INSN
-#error INSN not defined
-#endif
-
-#define __CONCATX(a,b) __CONCAT(a,b)
-
-TYPE
-__CONCATX(__,FUNC) (x)
- TYPE x;
-{
- TYPE result;
- asm ( INSN "\t%" REGS "0, %" REGS "1" :
- "=w" (result) : "w" (x) );
- return result;
-}
-
-#define weak_aliasx(a,b) weak_alias(a,b)
-weak_aliasx (__CONCATX(__,FUNC), FUNC)
-#define strong_aliasx(a,b) strong_alias(a,b)
-#ifdef NO_LONG_DOUBLE
-strong_aliasx (__CONCATX(__,FUNC), __CONCATX(__,__CONCATX(FUNC,l)))
-weak_aliasx (__CONCATX(__,FUNC), __CONCATX(FUNC,l))
-#endif
Added: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_frintf.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_frintf.c (added)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_frintf.c Thu Nov 22 00:01:51 2012
@@ -1,0 +1,24 @@
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
+
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef FUNC
+# error FUNC not defined
+#endif
+#define TYPE float
+#define REGS "s"
+#include <s_frint.c>
Removed: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_frintf.x
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_frintf.x (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_frintf.x (removed)
@@ -1,24 +1,0 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of the
- License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#ifndef FUNC
-#error FUNC not defined
-#endif
-#define TYPE float
-#define REGS "s"
-#include <s_frint.x>
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_llrint.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_llrint.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_llrint.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_llrintf.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_llrintf.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_llrintf.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_llround.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_llround.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_llround.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_llroundf.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_llroundf.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_llroundf.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_lrint.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_lrint.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_lrint.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -19,20 +19,20 @@
#include <math.h>
#ifndef FUNC
-#define FUNC lrint
+# define FUNC lrint
#endif
#ifndef ITYPE
-#define ITYPE double
-#define IREGS "d"
+# define ITYPE double
+# define IREGS "d"
#else
-#ifndef IREGS
-#error IREGS not defined
-#endif
+# ifndef IREGS
+# error IREGS not defined
+# endif
#endif
#ifndef OTYPE
-#define OTYPE long int
+# define OTYPE long int
#endif
#define OREGS "x"
@@ -40,8 +40,7 @@
#define __CONCATX(a,b) __CONCAT(a,b)
OTYPE
-__CONCATX(__,FUNC) (x)
- ITYPE x;
+__CONCATX(__,FUNC) (ITYPE x)
{
OTYPE result;
ITYPE temp;
@@ -51,10 +50,4 @@
return result;
}
-#define weak_aliasx(a,b) weak_alias(a,b)
-weak_aliasx (__CONCATX(__,FUNC), FUNC)
-#define strong_aliasx(a,b) strong_alias(a,b)
-#ifdef NO_LONG_DOUBLE
-strong_aliasx (__CONCATX(__,FUNC), __CONCATX(__,__CONCATX(FUNC,l)))
-weak_aliasx (__CONCATX(__,FUNC), __CONCATX(FUNC,l))
-#endif
+weak_alias (__CONCATX(__,FUNC), FUNC)
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_lrintf.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_lrintf.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_lrintf.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_lround.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_lround.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_lround.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -19,20 +19,20 @@
#include <math.h>
#ifndef FUNC
-#define FUNC lround
+# define FUNC lround
#endif
#ifndef ITYPE
-#define ITYPE double
-#define IREGS "d"
+# define ITYPE double
+# define IREGS "d"
#else
-#ifndef IREGS
-#error IREGS not defined
-#endif
+# ifndef IREGS
+# error IREGS not defined
+# endif
#endif
#ifndef OTYPE
-#define OTYPE long int
+# define OTYPE long int
#endif
#define OREGS "x"
@@ -40,8 +40,7 @@
#define __CONCATX(a,b) __CONCAT(a,b)
OTYPE
-__CONCATX(__,FUNC) (x)
- ITYPE x;
+__CONCATX(__,FUNC) (ITYPE x)
{
OTYPE result;
asm ( "fcvtas" "\t%" OREGS "0, %" IREGS "1"
@@ -49,10 +48,4 @@
return result;
}
-#define weak_aliasx(a,b) weak_alias(a,b)
-weak_aliasx (__CONCATX(__,FUNC), FUNC)
-#define strong_aliasx(a,b) strong_alias(a,b)
-#ifdef NO_LONG_DOUBLE
-strong_aliasx (__CONCATX(__,FUNC), __CONCATX(__,__CONCATX(FUNC,l)))
-weak_aliasx (__CONCATX(__,FUNC), __CONCATX(FUNC,l))
-#endif
+weak_alias (__CONCATX(__,FUNC), FUNC)
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_lroundf.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_lroundf.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_lroundf.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_nearbyint.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_nearbyint.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_nearbyint.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -18,4 +18,4 @@
#define FUNC nearbyint
#define INSN "frinti"
-#include <s_frint.x>
+#include <s_frint.c>
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_nearbyintf.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_nearbyintf.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_nearbyintf.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -18,4 +18,4 @@
#define FUNC nearbyintf
#define INSN "frinti"
-#include <s_frintf.x>
+#include <s_frintf.c>
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_rint.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_rint.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_rint.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -16,6 +16,6 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#define FUNC rint
+#define FUNC rint
#define INSN "frintx"
-#include <s_frint.x>
+#include <s_frint.c>
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_rintf.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_rintf.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_rintf.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -18,4 +18,4 @@
#define FUNC rintf
#define INSN "frintx"
-#include <s_frintf.x>
+#include <s_frintf.c>
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_round.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_round.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_round.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -18,4 +18,4 @@
#define FUNC round
#define INSN "frinta"
-#include <s_frint.x>
+#include <s_frint.c>
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_roundf.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_roundf.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_roundf.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -18,4 +18,4 @@
#define FUNC roundf
#define INSN "frinta"
-#include <s_frintf.x>
+#include <s_frintf.c>
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_trunc.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_trunc.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_trunc.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -18,4 +18,4 @@
#define FUNC trunc
#define INSN "frintz"
-#include <s_frint.x>
+#include <s_frint.c>
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_truncf.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_truncf.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/fpu/s_truncf.c Thu Nov 22 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -18,4 +18,4 @@
#define FUNC truncf
#define INSN "frintz"
-#include <s_frintf.x>
+#include <s_frintf.c>
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/tlsdesc.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/tlsdesc.c (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/tlsdesc.c Thu Nov 22 00:01:51 2012
@@ -1,6 +1,6 @@
/* Manage TLS descriptors. AArch64 version.
- Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+ Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Modified: fsf/trunk/libc/ports/sysdeps/arm/configure
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/arm/configure (original)
+++ fsf/trunk/libc/ports/sysdeps/arm/configure Thu Nov 22 00:01:51 2012
@@ -197,4 +197,7 @@
if test $libc_cv_arm_pcs_vfp = yes; then
$as_echo "#define HAVE_ARM_PCS_VFP 1" >>confdefs.h
-fi
+ echo "default-abi := hard" > default-abi.make
+else
+ echo "default-abi := soft" > default-abi.make
+fi
Modified: fsf/trunk/libc/ports/sysdeps/arm/configure.in
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/arm/configure.in (original)
+++ fsf/trunk/libc/ports/sysdeps/arm/configure.in Thu Nov 22 00:01:51 2012
@@ -40,4 +40,7 @@
], libc_cv_arm_pcs_vfp=yes, libc_cv_arm_pcs_vfp=no)])
if test $libc_cv_arm_pcs_vfp = yes; then
AC_DEFINE(HAVE_ARM_PCS_VFP)
+ echo "default-abi := hard" > default-abi.make
+else
+ echo "default-abi := soft" > default-abi.make
fi
Modified: fsf/trunk/libc/ports/sysdeps/arm/fesetenv.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/arm/fesetenv.c (original)
+++ fsf/trunk/libc/ports/sysdeps/arm/fesetenv.c Thu Nov 22 00:01:51 2012
@@ -40,6 +40,16 @@
_FPU_SETCW (temp);
+ if (envp == FE_NOMASK_ENV)
+ {
+ /* VFPv3 and VFPv4 do not support trapping exceptions, so
+ test whether the relevant bits were set and fail if
+ not. */
+ _FPU_GETCW (temp);
+ if ((temp & _FPU_IEEE) != _FPU_IEEE)
+ return 1;
+ }
+
/* Success. */
return 0;
}
Modified: fsf/trunk/libc/ports/sysdeps/mips/jmpbuf-unwind.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/mips/jmpbuf-unwind.h (original)
+++ fsf/trunk/libc/ports/sysdeps/mips/jmpbuf-unwind.h Thu Nov 22 00:01:51 2012
@@ -33,7 +33,7 @@
static inline uintptr_t __attribute__ ((unused))
_jmpbuf_sp (__jmp_buf regs)
{
- uintptr_t sp = regs[0].__sp;
+ uintptr_t sp = (uintptr_t) regs[0].__sp;
#ifdef PTR_DEMANGLE
PTR_DEMANGLE (sp);
#endif
Added: fsf/trunk/libc/ports/sysdeps/mips/sotruss-lib.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/mips/sotruss-lib.c (added)
+++ fsf/trunk/libc/ports/sysdeps/mips/sotruss-lib.c Thu Nov 22 00:01:51 2012
@@ -1,0 +1,117 @@
+/* Override generic sotruss-lib.c to define actual functions for MIPS.
+ Copyright (C) 2012 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library. If not, see
+ <http://www.gnu.org/licenses/>. */
+
+#define HAVE_ARCH_PLTENTER
+#define HAVE_ARCH_PLTEXIT
+
+#include <elf/sotruss-lib.c>
+
+#if _MIPS_SIM == _ABIO32
+
+ElfW(Addr)
+la_mips_o32_gnu_pltenter (ElfW(Sym) *sym __attribute__ ((unused)),
+ unsigned int ndx __attribute__ ((unused)),
+ uintptr_t *refcook, uintptr_t *defcook,
+ La_mips_32_regs *regs, unsigned int *flags,
+ const char *symname, long int *framesizep)
+{
+ print_enter (refcook, defcook, symname,
+ regs->lr_reg[0], regs->lr_reg[1], regs->lr_reg[2],
+ *flags);
+
+ /* No need to copy anything, we will not need the parameters in any case. */
+ *framesizep = 0;
+
+ return sym->st_value;
+}
+
+unsigned int
+la_mips_o32_gnu_pltexit (ElfW(Sym) *sym, unsigned int ndx, uintptr_t *refcook,
+ uintptr_t *defcook,
+ const struct La_mips_32_regs *inregs,
+ struct La_mips_32_retval *outregs,
+ const char *symname)
+{
+ print_exit (refcook, defcook, symname, outregs->lrv_v0);
+
+ return 0;
+}
+
+#elif _MIPS_SIM == _ABIN32
+
+ElfW(Addr)
+la_mips_n32_gnu_pltenter (ElfW(Sym) *sym __attribute__ ((unused)),
+ unsigned int ndx __attribute__ ((unused)),
+ uintptr_t *refcook, uintptr_t *defcook,
+ La_mips_64_regs *regs, unsigned int *flags,
+ const char *symname, long int *framesizep)
+{
+ print_enter (refcook, defcook, symname,
+ regs->lr_reg[0], regs->lr_reg[1], regs->lr_reg[2],
+ *flags);
+
+ /* No need to copy anything, we will not need the parameters in any case. */
+ *framesizep = 0;
+
+ return sym->st_value;
+}
+
+unsigned int
+la_mips_n32_gnu_pltexit (ElfW(Sym) *sym, unsigned int ndx, uintptr_t *refcook,
+ uintptr_t *defcook,
+ const struct La_mips_64_regs *inregs,
+ struct La_mips_64_retval *outregs,
+ const char *symname)
+{
+ print_exit (refcook, defcook, symname, outregs->lrv_v0);
+
+ return 0;
+}
+
+#else
+
+ElfW(Addr)
+la_mips_n64_gnu_pltenter (ElfW(Sym) *sym __attribute__ ((unused)),
+ unsigned int ndx __attribute__ ((unused)),
+ uintptr_t *refcook, uintptr_t *defcook,
+ La_mips_64_regs *regs, unsigned int *flags,
+ const char *symname, long int *framesizep)
+{
+ print_enter (refcook, defcook, symname,
+ regs->lr_reg[0], regs->lr_reg[1], regs->lr_reg[2],
+ *flags);
+
+ /* No need to copy anything, we will not need the parameters in any case. */
+ *framesizep = 0;
+
+ return sym->st_value;
+}
+
+unsigned int
+la_mips_n64_gnu_pltexit (ElfW(Sym) *sym, unsigned int ndx, uintptr_t *refcook,
+ uintptr_t *defcook,
+ const struct La_mips_64_regs *inregs,
+ struct La_mips_64_retval *outregs,
+ const char *symname)
+{
+ print_exit (refcook, defcook, symname, outregs->lrv_v0);
+
+ return 0;
+}
+
+#endif
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h Thu Nov 22 00:01:51 2012
@@ -96,7 +96,7 @@
__lll_private_flag (__op, private), \
(val), (timespec), NULL /* Unused. */, \
FUTEX_BITSET_MATCH_ANY); \
- INTERNAL_SYSCALL_ERROR_P (__ret, __err) ? -__ret : __ret; \
+ __ret; \
})
#define lll_futex_wake(futexp, nr, private) \
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/Makefile
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/Makefile (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/Makefile Thu Nov 22 00:01:51 2012
@@ -70,25 +70,16 @@
LDFLAGS-tst-rfc3484-3 += $(common-objpfx)csu/libc-do-syscall.o
endif
-define default-abi-prog
-echo '#ifdef __ARM_PCS_VFP';
-echo 'hard';
-echo '#else';
-echo 'soft';
-echo '#endif'
-endef
-default-abi := $(strip $(shell \
- ($(default-abi-prog)) | $(CC) $(CFLAGS) $(CPPFLAGS) -E -P -))
-ifeq ($(default-abi),hard)
-# OK.
-else
-ifneq ($(default-abi),soft)
-Unknown ABI, must be "hard" or "soft".
-endif
+# Get value of default-abi.
+include $(common-objpfx)default-abi.make
+
+abi-variants := soft hard
+
+ifeq (,$(filter $(default-abi),$(abi-variants)))
+Unknown ABI, must be one of $(abi-variants)
endif
abi-includes :=
-abi-variants := soft hard
abi-soft-options := -U__ARM_PCS_VFP
abi-soft-condition := !defined __ARM_PCS_VFP
abi-soft-ld-soname := ld-linux.so.3
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h Thu Nov 22 00:01:51 2012
@@ -97,7 +97,7 @@
__lll_private_flag (__op, private), \
(val), (timespec), NULL /* Unused. */, \
FUTEX_BITSET_MATCH_ANY); \
- INTERNAL_SYSCALL_ERROR_P (__ret, __err) ? -__ret : __ret; \
+ __ret; \
})
#define lll_futex_wake(futexp, nr, private) \
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits