[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r25080 - in /fsf/trunk/libc: ./ ports/ ports/sysdeps/aarch64/ ports/sysdeps/unix/sysv/linux/aarch64/ sysdeps/unix/sysv/linux...
- To: commits@xxxxxxxxxx
- Subject: [Commits] r25080 - in /fsf/trunk/libc: ./ ports/ ports/sysdeps/aarch64/ ports/sysdeps/unix/sysv/linux/aarch64/ sysdeps/unix/sysv/linux...
- From: eglibc@xxxxxxxxxx
- Date: Tue, 21 Jan 2014 08:02:05 -0000
Author: eglibc
Date: Tue Jan 21 00:02:04 2014
New Revision: 25080
Log:
Import glibc-mainline for 2014-01-21
Added:
fsf/trunk/libc/ports/sysdeps/aarch64/configure
fsf/trunk/libc/ports/sysdeps/aarch64/configure.ac
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/NEWS
fsf/trunk/libc/ports/ChangeLog.aarch64
fsf/trunk/libc/ports/sysdeps/aarch64/shlib-versions
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/Makefile
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/clone.S
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/ldconfig.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/time.c
fsf/trunk/libc/sysdeps/x86_64/x32/symbol-hacks.h
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Jan 21 00:02:04 2014
@@ -1,3 +1,15 @@
+2014-01-20 H.J. Lu <hongjiu.lu@xxxxxxxxx>
+
+ [BZ #15605]
+ * sysdeps/x86_64/x32/symbol-hacks.h: Include generic symbol-hacks.h.
+
+2014-01-20 Adhemerval Zanella <azanella@xxxxxxxxxxxxxxxxxx>
+
+ [BZ#16431]
+ * sysdeps/unix/sysv/linux/powerpc/gettimeofday.c (__gettimeofday):
+ Adjust the vDSO correctly for internal calls.
+ * sysdeps/unix/sysv/linux/powerpc/time.c (time): Likewise.
+
2014-01-20 Allan McRae <allan@xxxxxxxxxxxxx>
* po/ca.po: Update Catalan translation from translation project.
Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Tue Jan 21 00:02:04 2014
@@ -22,10 +22,10 @@
15919, 15921, 15923, 15939, 15941, 15948, 15963, 15966, 15985, 15988,
15997, 16032, 16034, 16036, 16037, 16038, 16041, 16055, 16071, 16072,
16074, 16077, 16078, 16103, 16112, 16133, 16143, 16144, 16146, 16150,
- 16151, 16153, 16167, 16172, 16195, 16214, 16245, 16271, 16274, 16283,
- 16289, 16293, 16314, 16316, 16330, 16337, 16338, 16356, 16365, 16366,
- 16369, 16372, 16375, 16379, 16384, 16385, 16386, 16387, 16390, 16394,
- 16400, 16407, 16408, 16414, 16430, 16453.
+ 16151, 16153, 16167, 16169, 16172, 16195, 16214, 16245, 16271, 16274,
+ 16283, 16289, 16293, 16314, 16316, 16330, 16337, 16338, 16356, 16365,
+ 16366, 16369, 16372, 16375, 16379, 16384, 16385, 16386, 16387, 16390,
+ 16394, 16400, 16407, 16408, 16414, 16430, 16431, 16453.
* Slovenian translations for glibc messages have been contributed by the
Translation Project's Slovenian team of translators.
Modified: fsf/trunk/libc/ports/ChangeLog.aarch64
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.aarch64 (original)
+++ fsf/trunk/libc/ports/ChangeLog.aarch64 Tue Jan 21 00:02:04 2014
@@ -1,3 +1,26 @@
+2014-01-20 Marcus Shawcroft <marcus.shawcroft@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/aarch64/Makefile (abi-lp64_be-options): Fix
+ type in define.
+
+2014-01-20 Tom Tromey <tromey@xxxxxxxxxx>
+
+ [BZ #16169]
+ * sysdeps/unix/sysv/linux/aarch64/clone.S (__clone): Add CFI
+ directives; Zero x29.
+
+2014-01-20 Marcus Shawcroft <marcus.shawcroft@xxxxxxxxxx>
+
+ * sysdeps/aarch64/configure.ac: New file.
+ * sysdeps/aarch64/configure: New file.
+ * sysdeps/aarch64/shlib-versions: Define ld-linux-aarch64_be.so.1
+ * sysdeps/unix/sysv/linux/aarch64/Makefile (abi-variants)
+ (abi-lp64-options, abi-lp64-condition, abi-lp64-ld-soname)
+ (abi-lp64_be-options, abi-lp64_be-condition)
+ (abi-lp64_be-ld-soname) Define.
+ * sysdeps/unix/sysv/linux/aarch64/ldconfig.h
+ (SYSDEP_KNOWN_INTERPRETER_NAMES): Add ld-linux-aarch64_be.so.1
+
2014-01-07 Marcus Shawcroft <marcus.shawcroft@xxxxxxxxxx>
[BZ #16387]
Added: fsf/trunk/libc/ports/sysdeps/aarch64/configure
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/configure (added)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/configure Tue Jan 21 00:02:04 2014
@@ -1,0 +1,174 @@
+# This file is generated from configure.ac by Autoconf. DO NOT EDIT!
+ # Local configure fragment for sysdeps/aarch64.
+
+# We check to see if the compiler and flags are
+# selecting the big endian ABI and if they are then
+# we set libc_cv_aarch64_be to yes which causes
+# HAVE_AARCH64_BE to be defined in config.h and
+# in include/libc-symbols.h and thus available to
+# shlib-versions to select the appropriate name for
+# the dynamic linker via %ifdef.
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$GREP"; then
+ ac_path_GREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'GREP' >> "conftest.nl"
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_GREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
+ if test -z "$EGREP"; then
+ ac_path_EGREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'EGREP' >> "conftest.nl"
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_EGREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_EGREP=$EGREP
+fi
+
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for big endian" >&5
+$as_echo_n "checking for big endian... " >&6; }
+if ${libc_cv_aarch64_be+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __AARCH64EB__
+ yes
+ #endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "yes" >/dev/null 2>&1; then :
+ libc_cv_aarch64_be=yes
+else
+ libc_cv_aarch64_be=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_aarch64_be" >&5
+$as_echo "$libc_cv_aarch64_be" >&6; }
+if test $libc_cv_aarch64_be = yes; then
+ $as_echo "#define HAVE_AARCH64_BE 1" >>confdefs.h
+
+ config_vars="$config_vars
+default-abi = lp64_be"
+else
+ config_vars="$config_vars
+default-abi = lp64"
+fi
Added: fsf/trunk/libc/ports/sysdeps/aarch64/configure.ac
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/configure.ac (added)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/configure.ac Tue Jan 21 00:02:04 2014
@@ -1,0 +1,22 @@
+GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
+# Local configure fragment for sysdeps/aarch64.
+
+# We check to see if the compiler and flags are
+# selecting the big endian ABI and if they are then
+# we set libc_cv_aarch64_be to yes which causes
+# HAVE_AARCH64_BE to be defined in config.h and
+# in include/libc-symbols.h and thus available to
+# shlib-versions to select the appropriate name for
+# the dynamic linker via %ifdef.
+AC_CACHE_CHECK([for big endian],
+ [libc_cv_aarch64_be],
+ [AC_EGREP_CPP(yes,[#ifdef __AARCH64EB__
+ yes
+ #endif
+ ], libc_cv_aarch64_be=yes, libc_cv_aarch64_be=no)])
+if test $libc_cv_aarch64_be = yes; then
+ AC_DEFINE(HAVE_AARCH64_BE)
+ LIBC_CONFIG_VAR([default-abi], [lp64_be])
+else
+ LIBC_CONFIG_VAR([default-abi], [lp64])
+fi
Modified: fsf/trunk/libc/ports/sysdeps/aarch64/shlib-versions
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/shlib-versions (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/shlib-versions Tue Jan 21 00:02:04 2014
@@ -1,2 +1,7 @@
aarch64.*-.*-linux.* DEFAULT GLIBC_2.17
+
+%ifdef HAVE_AARCH64_BE
+aarch64.*-.*-linux.* ld=ld-linux-aarch64_be.so.1
+%else
aarch64.*-.*-linux.* ld=ld-linux-aarch64.so.1
+%endif
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/Makefile
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/Makefile (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/Makefile Tue Jan 21 00:02:04 2014
@@ -22,3 +22,18 @@
ifeq ($(subdir),stdlib)
gen-as-const-headers += ucontext_i.sym
endif
+
+abi-variants := lp64
+abi-variants += lp64_be
+
+ifeq (,$(filter $(default-abi),$(abi-variants)))
+Unknown ABI, must be one of $(abi-variants)
+endif
+
+abi-lp64-options := -U__AARCH64EB__
+abi-lp64-condition := !defined __AARCH64EB__
+abi-lp64-ld-soname := ld-linux-aarch64.so.1
+
+abi-lp64_be-options := -D__AARCH64EB__
+abi-lp64_be-condition := defined __AARCH64EB__
+abi-lp64_be-ld-soname := ld-linux-aarch64_be.so.1
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/clone.S
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/clone.S (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/clone.S Tue Jan 21 00:02:04 2014
@@ -63,6 +63,7 @@
mov x8, #SYS_ify(clone)
/* X0:flags, x1:newsp, x2:parenttidptr, x3:newtls, x4:childtid. */
svc 0x0
+ cfi_endproc
cmp x0, #0
beq 2f
blt 3f
@@ -72,6 +73,9 @@
b syscall_error
2:
+ cfi_startproc
+ cfi_undefined (x30)
+ mov x29, 0
#ifdef RESET_PID
tbnz x5, #CLONE_THREAD_BIT, 3f
mov x0, #-1
@@ -93,7 +97,8 @@
/* We are done, pass the return value through x0. */
b HIDDEN_JUMPTARGET(_exit)
-
+ cfi_endproc
+ cfi_startproc
PSEUDO_END (__clone)
weak_alias (__clone, clone)
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/ldconfig.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/ldconfig.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/ldconfig.h Tue Jan 21 00:02:04 2014
@@ -20,6 +20,7 @@
#define SYSDEP_KNOWN_INTERPRETER_NAMES \
{ "/lib/ld-linux-aarch64.so.1", FLAG_ELF_LIBC6 }, \
+ { "/lib/ld-linux-aarch64_be.so.1", FLAG_ELF_LIBC6 }, \
{ "/lib/ld-linux.so.3", FLAG_ELF_LIBC6 }, \
{ "/lib/ld-linux-armhf.so.3", FLAG_ELF_LIBC6 },
#define SYSDEP_KNOWN_LIBRARY_NAMES \
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c Tue Jan 21 00:02:04 2014
@@ -35,9 +35,12 @@
void *
gettimeofday_ifunc (void)
{
+ PREPARE_VERSION (linux2615, "LINUX_2.6.15", 123718565);
+
/* If the vDSO is not available we fall back syscall. */
- return (__vdso_gettimeofday ? VDSO_IFUNC_RET (__vdso_gettimeofday)
- : __gettimeofday_syscall);
+ void *vdso_gettimeofday = _dl_vdso_vsym ("__kernel_gettimeofday", &linux2615);
+ return (vdso_gettimeofday ? VDSO_IFUNC_RET (vdso_gettimeofday)
+ : (void*)__gettimeofday_syscall);
}
asm (".type __gettimeofday, %gnu_indirect_function");
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/time.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/time.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/time.c Tue Jan 21 00:02:04 2014
@@ -45,9 +45,12 @@
void *
time_ifunc (void)
{
+ PREPARE_VERSION (linux2615, "LINUX_2.6.15", 123718565);
+
/* If the vDSO is not available we fall back to the syscall. */
- return (__vdso_time ? VDSO_IFUNC_RET (__vdso_time)
- : time_syscall);
+ void *vdso_time = _dl_vdso_vsym ("__kernel_time", &linux2615);
+ return (vdso_time ? VDSO_IFUNC_RET (vdso_time)
+ : (void*)time_syscall);
}
asm (".type time, %gnu_indirect_function");
Modified: fsf/trunk/libc/sysdeps/x86_64/x32/symbol-hacks.h
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/x32/symbol-hacks.h (original)
+++ fsf/trunk/libc/sysdeps/x86_64/x32/symbol-hacks.h Tue Jan 21 00:02:04 2014
@@ -1,1 +1,1 @@
-/* Fortunately nothing to do. */
+#include <sysdeps/generic/symbol-hacks.h>
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits