- up from upstream branch

diff --git a/glibc-git.patch b/glibc-git.patch
index a7b6f1f9da2ad9053a12437d32546c3d7427f2f9..12f94b77576c975459c87ca79581fb6e7b7aa658 100644 (file)
--- a/glibc-git.patch
+++ b/glibc-git.patch
@@ -1,8 +1,27 @@
 diff --git a/ChangeLog b/ChangeLog
-index 2e4afb7..f5ae211 100644
+index 2e4afb7..7895446 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,5 +1,38 @@
+@@ -1,5 +1,57 @@
++2016-02-22  Roland McGrath  <roland@hack.frob.com>
++
++      * sysdeps/arm/nacl/libc.abilist (GLIBC_2.23): Add GLIBC_2.23,
++      fts64_children, fts64_close, fts64_open, fts64_read and fts64_set.
++
++2016-02-22  H.J. Lu  <hongjiu.lu@intel.com>
++
++      [BZ #19679]
++      * sysdeps/x86_64/dl-trampoline.S (DL_RUNIME_UNALIGNED_VEC_SIZE):
++      Renamed to ...
++      (DL_RUNTIME_UNALIGNED_VEC_SIZE): This.  Set to 8.
++      (DL_RUNIME_RESOLVE_REALIGN_STACK): Renamed to ...
++      (DL_RUNTIME_RESOLVE_REALIGN_STACK): This.  Updated.
++      (DL_RUNIME_RESOLVE_REALIGN_STACK): Renamed to ...
++      (DL_RUNTIME_RESOLVE_REALIGN_STACK): This.
++      * sysdeps/x86_64/dl-trampoline.h
++      (DL_RUNIME_RESOLVE_REALIGN_STACK): Renamed to ...
++      (DL_RUNTIME_RESOLVE_REALIGN_STACK): This.
++
  2016-02-18  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
  
 +      * configure: Regenerated.
@@ -55046,3 +55065,104 @@ index 90c47e4..9ca8cb1 100644
  #~ msgid "compile-time support for database policy missing"
  #~ msgstr "compile-time 支援用於資料庫策略缺少"
  
+diff --git a/sysdeps/arm/nacl/libc.abilist b/sysdeps/arm/nacl/libc.abilist
+index 561441e..0560510 100644
+--- a/sysdeps/arm/nacl/libc.abilist
++++ b/sysdeps/arm/nacl/libc.abilist
+@@ -1834,3 +1834,9 @@ GLIBC_2.22 wprintf F
+ GLIBC_2.22 write F
+ GLIBC_2.22 writev F
+ GLIBC_2.22 wscanf F
++GLIBC_2.23 GLIBC_2.23 A
++GLIBC_2.23 fts64_children F
++GLIBC_2.23 fts64_close F
++GLIBC_2.23 fts64_open F
++GLIBC_2.23 fts64_read F
++GLIBC_2.23 fts64_set F
+diff --git a/sysdeps/x86_64/dl-trampoline.S b/sysdeps/x86_64/dl-trampoline.S
+index 9fb6b13..39b8771 100644
+--- a/sysdeps/x86_64/dl-trampoline.S
++++ b/sysdeps/x86_64/dl-trampoline.S
+@@ -33,15 +33,19 @@
+ # define DL_STACK_ALIGNMENT 8
+ #endif
+ 
+-#ifndef DL_RUNIME_UNALIGNED_VEC_SIZE
+-/* The maximum size of unaligned vector load and store.  */
+-# define DL_RUNIME_UNALIGNED_VEC_SIZE 16
++#ifndef DL_RUNTIME_UNALIGNED_VEC_SIZE
++/* The maximum size in bytes of unaligned vector load and store in the
++   dynamic linker.  Since SSE optimized memory/string functions with
++   aligned SSE register load and store are used in the dynamic linker,
++   we must set this to 8 so that _dl_runtime_resolve_sse will align the
++   stack before calling _dl_fixup.  */
++# define DL_RUNTIME_UNALIGNED_VEC_SIZE 8
+ #endif
+ 
+ /* True if _dl_runtime_resolve should align stack to VEC_SIZE bytes.  */
+-#define DL_RUNIME_RESOLVE_REALIGN_STACK \
++#define DL_RUNTIME_RESOLVE_REALIGN_STACK \
+   (VEC_SIZE > DL_STACK_ALIGNMENT \
+-   && VEC_SIZE > DL_RUNIME_UNALIGNED_VEC_SIZE)
++   && VEC_SIZE > DL_RUNTIME_UNALIGNED_VEC_SIZE)
+ 
+ /* Align vector register save area to 16 bytes.  */
+ #define REGISTER_SAVE_VEC_OFF 0
+@@ -76,7 +80,7 @@
+ #ifdef HAVE_AVX512_ASM_SUPPORT
+ # define VEC_SIZE             64
+ # define VMOVA                        vmovdqa64
+-# if DL_RUNIME_RESOLVE_REALIGN_STACK || VEC_SIZE <= DL_STACK_ALIGNMENT
++# if DL_RUNTIME_RESOLVE_REALIGN_STACK || VEC_SIZE <= DL_STACK_ALIGNMENT
+ #  define VMOV                        vmovdqa64
+ # else
+ #  define VMOV                        vmovdqu64
+@@ -100,7 +104,7 @@ strong_alias (_dl_runtime_profile_avx, _dl_runtime_profile_avx512)
+ 
+ #define VEC_SIZE              32
+ #define VMOVA                 vmovdqa
+-#if DL_RUNIME_RESOLVE_REALIGN_STACK || VEC_SIZE <= DL_STACK_ALIGNMENT
++#if DL_RUNTIME_RESOLVE_REALIGN_STACK || VEC_SIZE <= DL_STACK_ALIGNMENT
+ # define VMOV                 vmovdqa
+ #else
+ # define VMOV                 vmovdqu
+@@ -119,7 +123,7 @@ strong_alias (_dl_runtime_profile_avx, _dl_runtime_profile_avx512)
+ /* movaps/movups is 1-byte shorter.  */
+ #define VEC_SIZE              16
+ #define VMOVA                 movaps
+-#if DL_RUNIME_RESOLVE_REALIGN_STACK || VEC_SIZE <= DL_STACK_ALIGNMENT
++#if DL_RUNTIME_RESOLVE_REALIGN_STACK || VEC_SIZE <= DL_STACK_ALIGNMENT
+ # define VMOV                 movaps
+ #else
+ # define VMOV                 movups
+diff --git a/sysdeps/x86_64/dl-trampoline.h b/sysdeps/x86_64/dl-trampoline.h
+index f419183..b90836a 100644
+--- a/sysdeps/x86_64/dl-trampoline.h
++++ b/sysdeps/x86_64/dl-trampoline.h
+@@ -30,7 +30,7 @@
+ #undef REGISTER_SAVE_AREA
+ #undef LOCAL_STORAGE_AREA
+ #undef BASE
+-#if DL_RUNIME_RESOLVE_REALIGN_STACK
++#if DL_RUNTIME_RESOLVE_REALIGN_STACK
+ # define REGISTER_SAVE_AREA   (REGISTER_SAVE_AREA_RAW + 8)
+ /* Local stack area before jumping to function address: RBX.  */
+ # define LOCAL_STORAGE_AREA   8
+@@ -57,7 +57,7 @@
+       cfi_startproc
+ _dl_runtime_resolve:
+       cfi_adjust_cfa_offset(16) # Incorporate PLT
+-#if DL_RUNIME_RESOLVE_REALIGN_STACK
++#if DL_RUNTIME_RESOLVE_REALIGN_STACK
+ # if LOCAL_STORAGE_AREA != 8
+ #  error LOCAL_STORAGE_AREA must be 8
+ # endif
+@@ -146,7 +146,7 @@ _dl_runtime_resolve:
+       VMOV (REGISTER_SAVE_VEC_OFF + VEC_SIZE * 5)(%rsp), %VEC(5)
+       VMOV (REGISTER_SAVE_VEC_OFF + VEC_SIZE * 6)(%rsp), %VEC(6)
+       VMOV (REGISTER_SAVE_VEC_OFF + VEC_SIZE * 7)(%rsp), %VEC(7)
+-#if DL_RUNIME_RESOLVE_REALIGN_STACK
++#if DL_RUNTIME_RESOLVE_REALIGN_STACK
+       mov %RBX_LP, %RSP_LP
+       cfi_def_cfa_register(%rsp)
+       movq (%rsp), %rbx