Accepting request 155840 from home:Andreas_Schwab:Factory

- Update crypt ABI for aarch64 - Use lib64 for aarch64 and add link for /lib/ld-linux-aarch64.so.1 - Don't build profiling libraries for aarch64 OBS-URL: https://build.opensuse.org/request/show/155840 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=272
2013-02-19 17:17:41 +00:00 · 2013-02-19 17:17:41 +00:00 · e5ed97dcc4
commit e5ed97dcc4
parent 5f37d5f018
10 changed files with 227 additions and 117 deletions
--- a/crypt_blowfish-1.2-versioning.diff
+++ b/crypt_blowfish-1.2-versioning.diff
@ -1,6 +1,6 @@
 Index: crypt_blowfish-1.2/wrapper.c
 ===================================================================
--- crypt_blowfish-1.2/wrapper.c
+--- crypt_blowfish-1.2.orig/wrapper.c
 +++ crypt_blowfish-1.2/wrapper.c
@@ -38,6 +38,7 @@
 #define CRYPT_GENSALT_OUTPUT_SIZE	(7 + 22 + 1)
@ -10,12 +10,13 @@ Index: crypt_blowfish-1.2/wrapper.c
 #define __SKIP_GNU
 #endif
 #include "ow-crypt.h"
-@@ -291,14 +292,34 @@ char *__crypt_gensalt(const char *prefix
+@@ -286,14 +287,36 @@ char *__crypt_gensalt(const char *prefix
 }
 
 #if defined(__GLIBC__) && defined(_LIBC)
 -weak_alias(__crypt_rn, crypt_rn)
 -weak_alias(__crypt_ra, crypt_ra)
+#include <shlib-compat.h>
 weak_alias(__crypt_r, crypt_r)
 weak_alias(__crypt, crypt)
 -weak_alias(__crypt_gensalt_rn, crypt_gensalt_rn)
@ -24,7 +25,8 @@ Index: crypt_blowfish-1.2/wrapper.c
 -weak_alias(crypt, fcrypt)
 +weak_alias(__crypt, fcrypt)
 +#if SHARED
-+#if 1 // Owl has crypt_gensalt as GLIBC_2_0 so keep for compatibility
+/* Owl has crypt_gensalt as GLIBC_2_0 so keep for compatibility */
+#if SHLIB_COMPAT (libcrypt, GLIBC_2_0, GLIBC_2_14)
 +#define ow_compat_symbol(name) \
 +	compat_symbol(libcrypt, _compat_##name, name, GLIBC_2_0); \
 +	weak_alias(__##name, _compat_##name)
--- a/glibc-2.14-crypt-versioning.diff
+++ b/glibc-2.14-crypt-versioning.diff
@ -1,7 +1,7 @@
-Index: glibc-2.16.90/Versions.def
+Index: glibc-2.17/Versions.def
 ===================================================================
--- glibc-2.16.90.orig/Versions.def
-+++ glibc-2.16.90/Versions.def
+--- glibc-2.17.orig/Versions.def
+++ glibc-2.17/Versions.def
@@ -42,6 +42,7 @@ libc {
 }
 libcrypt {
@ -10,15 +10,23 @@ Index: glibc-2.16.90/Versions.def
 }
 libdl {
   GLIBC_2.0
-Index: glibc-2.16.90/crypt/Versions
+Index: glibc-2.17/crypt/Versions
 ===================================================================
--- glibc-2.16.90.orig/crypt/Versions
-+++ glibc-2.16.90/crypt/Versions
-@@ -3,4 +3,7 @@ libcrypt {
+--- glibc-2.17.orig/crypt/Versions
+++ glibc-2.17/crypt/Versions
+@@ -1,6 +1,15 @@
+%define SHARED
+%define IS_IN_libcrypt 1
+%include <shlib-compat.h>
+
+ libcrypt {
+   GLIBC_2.0 {
     crypt; crypt_r; encrypt; encrypt_r; fcrypt; setkey; setkey_r;
+%if SHLIB_COMPAT (libcrypt, GLIBC_2_0, GLIBC_2_14)
+    crypt_rn; crypt_ra; crypt_gensalt; crypt_gensalt_rn; crypt_gensalt_ra;
+%endif
+  }
+  OW_CRYPT_1.0 {
     crypt_rn; crypt_ra; crypt_gensalt; crypt_gensalt_rn; crypt_gensalt_ra;
   }
-+  OW_CRYPT_1.0 {
-+    crypt_rn; crypt_ra; crypt_gensalt; crypt_gensalt_rn; crypt_gensalt_ra;
-+  }
 }
--- a/glibc-aarch64-lib64.patch
+++ b/glibc-aarch64-lib64.patch
@ -0,0 +1,53 @@
+diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/configure b/ports/sysdeps/unix/sysv/linux/aarch64/configure
+index 5a22126..b806d27 100644
+--- a/ports/sysdeps/unix/sysv/linux/aarch64/configure
+++ b/ports/sysdeps/unix/sysv/linux/aarch64/configure
+@@ -1,3 +1,22 @@
+ # This file is generated from configure.in by Autoconf.  DO NOT EDIT!
+ # Local configure fragment for sysdeps/unix/sysv/linux/aarch64.
+ 
+ arch_minimum_kernel=3.7.0
+
+case "$prefix" in
+/usr | /usr/)
+  # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib.
+  # Allow earlier configure scripts to handle libc_cv_slibdir, libdir,
+  # and libc_cv_localedir.
+  test -n "$libc_cv_slibdir" ||
+  case $machine in
+  aarch64*)
+    libc_cv_slibdir="/lib64"
+    if test "$libdir" = '${exec_prefix}/lib'; then
+      libdir='${exec_prefix}/lib64';
+      # Locale data can be shared between 32bit and 64bit libraries
+      libc_cv_localedir='${exec_prefix}/lib/locale'
+    fi
+    ;;
+  esac
+esac
+diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/configure.in b/ports/sysdeps/unix/sysv/linux/aarch64/configure.in
+index d1995d4..e93fb3a 100644
+--- a/ports/sysdeps/unix/sysv/linux/aarch64/configure.in
+++ b/ports/sysdeps/unix/sysv/linux/aarch64/configure.in
+@@ -2,3 +2,21 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
+ # Local configure fragment for sysdeps/unix/sysv/linux/aarch64.
+ 
+ arch_minimum_kernel=3.7.0
+
+case "$prefix" in
+/usr | /usr/)
+  # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib.
+  # Allow earlier configure scripts to handle libc_cv_slibdir, libdir,
+  # and libc_cv_localedir.
+  test -n "$libc_cv_slibdir" ||
+  case $machine in
+  aarch64*)
+    libc_cv_slibdir="/lib64"
+    if test "$libdir" = '${exec_prefix}/lib'; then
+      libdir='${exec_prefix}/lib64';
+      # Locale data can be shared between 32bit and 64bit libraries
+      libc_cv_localedir='${exec_prefix}/lib/locale'
+    fi
+    ;;
+  esac
+esac
--- a/glibc-fix-check-abi.patch
+++ b/glibc-fix-check-abi.patch
@ -1,36 +1,25 @@
-
 The addition of the Blowfish cipher functions also requires updating
 the ABI check list for all targets.

---
- ports/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist                   |   12 ++++++++++
- ports/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist                     |   12 ++++++++++
- ports/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist                    |   12 ++++++++++
- ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abilist           |   12 ++++++++++
- ports/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilist             |   12 ++++++++++
- ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist             |   12 ++++++++++
- ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist         |   12 ++++++++++
- ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist         |   12 ++++++++++
- ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist |   12 ++++++++++
- ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libcrypt.abilist    |   12 ++++++++++
- ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libcrypt.abilist    |   12 ++++++++++
- ports/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libcrypt.abilist            |   12 ++++++++++
- sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist                                     |   12 ++++++++++
- sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist                    |   12 ++++++++++
- sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist                        |   12 ++++++++++
- sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist                             |   12 ++++++++++
- sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist                             |   12 ++++++++++
- sysdeps/unix/sysv/linux/sh/nptl/libcrypt.abilist                                       |   12 ++++++++++
- sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libcrypt.abilist                            |   12 ++++++++++
- sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libcrypt.abilist                            |   12 ++++++++++
- sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist                                |   12 ++++++++++
- sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist                               |   12 ++++++++++
- 22 files changed, 264 insertions(+)
-
-Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/aarch64/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/ports/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist
-+++ glibc-2.16/ports/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/aarch64/nptl/libcrypt.abilist
+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/aarch64/nptl/libcrypt.abilist
+@@ -7,3 +7,10 @@ GLIBC_2.17
+  fcrypt F
+  setkey F
+  setkey_r F
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
+ crypt_ra F
+ crypt_rn F
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist
+===================================================================
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist
+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.0
  GLIBC_2.0 A
@ -53,10 +42,10 @@ Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist
-+++ glibc-2.16/ports/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist
+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.4
  GLIBC_2.4 A
@ -79,10 +68,10 @@ Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/ports/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist
-+++ glibc-2.16/ports/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist
+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.0
  GLIBC_2.0 A
@ -105,10 +94,10 @@ Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abilist
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abilist
-+++ glibc-2.16/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abilist
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abilist
+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.4
  GLIBC_2.4 A
@ -131,10 +120,10 @@ Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abil
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilist
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/ports/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilist
-+++ glibc-2.16/ports/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilist
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilist
+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.0
  GLIBC_2.0 A
@ -157,10 +146,10 @@ Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilis
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist
-+++ glibc-2.16/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist
+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist
@@ -1,7 +1,12 @@
 GLIBC_2.0
  GLIBC_2.0 A
@ -185,10 +174,10 @@ Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilis
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist
-+++ glibc-2.16/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist
+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.0
  GLIBC_2.0 A
@ -211,10 +200,10 @@ Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.ab
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist
-+++ glibc-2.16/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist
+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.0
  GLIBC_2.0 A
@ -237,10 +226,10 @@ Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.ab
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist
-+++ glibc-2.16/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist
+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.0
  GLIBC_2.0 A
@ -263,10 +252,10 @@ Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/lib
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libcrypt.abilist
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libcrypt.abilist
-+++ glibc-2.16/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libcrypt.abilist
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libcrypt.abilist
+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.12
  GLIBC_2.12 A
@ -289,10 +278,10 @@ Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libcry
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libcrypt.abilist
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libcrypt.abilist
-+++ glibc-2.16/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libcrypt.abilist
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libcrypt.abilist
+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.12
  GLIBC_2.12 A
@ -315,10 +304,10 @@ Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libcry
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libcrypt.abilist
+Index: glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/ports/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libcrypt.abilist
-+++ glibc-2.16/ports/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libcrypt.abilist
+--- glibc-2.17.orig/ports/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libcrypt.abilist
+++ glibc-2.17/ports/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.12
  GLIBC_2.12 A
@ -341,10 +330,10 @@ Index: glibc-2.16/ports/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libcrypt.abili
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist
+Index: glibc-2.17/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist
-+++ glibc-2.16/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist
+++ glibc-2.17/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.0
  GLIBC_2.0 A
@ -367,10 +356,10 @@ Index: glibc-2.16/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist
+Index: glibc-2.17/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist
-+++ glibc-2.16/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist
+++ glibc-2.17/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.0
  GLIBC_2.0 A
@ -393,10 +382,10 @@ Index: glibc-2.16/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.ab
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist
+Index: glibc-2.17/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist
-+++ glibc-2.16/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist
+++ glibc-2.17/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.3
  GLIBC_2.3 A
@ -419,10 +408,10 @@ Index: glibc-2.16/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilis
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist
+Index: glibc-2.17/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist
-+++ glibc-2.16/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist
+++ glibc-2.17/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.0
  GLIBC_2.0 A
@ -445,10 +434,10 @@ Index: glibc-2.16/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist
+Index: glibc-2.17/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist
-+++ glibc-2.16/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist
+++ glibc-2.17/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.2
  GLIBC_2.2 A
@ -471,10 +460,10 @@ Index: glibc-2.16/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/sysdeps/unix/sysv/linux/sh/nptl/libcrypt.abilist
+Index: glibc-2.17/sysdeps/unix/sysv/linux/sh/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/sysdeps/unix/sysv/linux/sh/nptl/libcrypt.abilist
-+++ glibc-2.16/sysdeps/unix/sysv/linux/sh/nptl/libcrypt.abilist
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/sh/nptl/libcrypt.abilist
+++ glibc-2.17/sysdeps/unix/sysv/linux/sh/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.0
  GLIBC_2.0 A
@ -497,10 +486,10 @@ Index: glibc-2.16/sysdeps/unix/sysv/linux/sh/nptl/libcrypt.abilist
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libcrypt.abilist
+Index: glibc-2.17/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libcrypt.abilist
-+++ glibc-2.16/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libcrypt.abilist
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libcrypt.abilist
+++ glibc-2.17/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.0
  GLIBC_2.0 A
@ -523,10 +512,10 @@ Index: glibc-2.16/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libcrypt.abilist
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libcrypt.abilist
+Index: glibc-2.17/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libcrypt.abilist
-+++ glibc-2.16/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libcrypt.abilist
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libcrypt.abilist
+++ glibc-2.17/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.0
  GLIBC_2.0 A
@ -549,10 +538,10 @@ Index: glibc-2.16/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libcrypt.abilist
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist
+Index: glibc-2.17/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist
-+++ glibc-2.16/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist
+++ glibc-2.17/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist
@@ -1,9 +1,21 @@
 GLIBC_2.2.5
  GLIBC_2.2.5 A
@ -575,22 +564,11 @@ Index: glibc-2.16/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist
 + crypt_gensalt_rn F
 + crypt_ra F
 + crypt_rn F
-Index: glibc-2.16/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist
+Index: glibc-2.17/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist
 ===================================================================
--- glibc-2.16.orig/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist
-+++ glibc-2.16/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist
-@@ -1,9 +1,21 @@
- GLIBC_2.16
-  GLIBC_2.16 A
-  crypt F
-+ crypt_gensalt F
-+ crypt_gensalt_ra F
-+ crypt_gensalt_rn F
-  crypt_r F
-+ crypt_ra F
-+ crypt_rn F
-  encrypt F
-  encrypt_r F
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist
+++ glibc-2.17/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist
+@@ -7,3 +7,10 @@ GLIBC_2.16
  fcrypt F
  setkey F
  setkey_r F
--- a/glibc-testsuite.changes
+++ b/glibc-testsuite.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 18 09:28:23 UTC 2013 - schwab@suse.de
+
+- Update crypt ABI for aarch64
+- Use lib64 for aarch64 and add link for /lib/ld-linux-aarch64.so.1
+- Don't build profiling libraries for aarch64
+
 -------------------------------------------------------------------
 Tue Feb  5 09:28:44 UTC 2013 - schwab@suse.de

--- a/glibc-testsuite.spec
+++ b/glibc-testsuite.spec
@ -62,7 +62,12 @@ BuildRequires:  gd-devel
 %define build_html 0
 %else
 # Default:
+%ifarch aarch64
+# aarch64 doesn't support -pg yet
+%define build_profile 0
+%else
 %define build_profile 1
+%endif
 %define build_locales 1
 %define build_html 1
 %endif
@ -250,6 +255,8 @@ Patch2008:      glibc-ld-profile.patch
 Patch2009:      pthread-cond-timedwait-i486.patch
 # PATCH-FIX-OPENSUSE Properly check for short writes when sending the response in nscd
 Patch2010:      nscd-short-write.patch
+# PATCH-FIX-OPENSUSE Use lib64 for aarch64
+Patch2011:      glibc-aarch64-lib64.patch

 %description
 The GNU C Library provides the most important standard libraries used
@ -456,6 +463,7 @@ rm nscd/s-stamp
 # %patch2008 -p1
 %patch2009 -p1
 %patch2010 -p1
+%patch2011 -p1

 #
 # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed!
@ -819,6 +827,10 @@ cp -av bits/stdio-lock.h %{buildroot}%{_includedir}/bits/stdio-lock.h
 	mkdir %{buildroot}/lib
 	ln -sf ../%{_lib}/ld-%{glibc_major_version}.so %{buildroot}/lib/ld64.so.1
 %endif
+%ifarch aarch64
+mkdir %{buildroot}/lib
+ln -sf ../%{_lib}/ld-%{glibc_major_version}.so %{buildroot}/lib/ld-linux-aarch64.so.1
+%endif

 # Miscelanna:

@ -1057,6 +1069,10 @@ exit 0
 %ifarch %ix86 %sparc
 /%{_lib}/ld-linux.so.2
 %endif
+%ifarch aarch64
+/lib/ld-linux-aarch64.so.1
+/%{_lib}/ld-linux-aarch64.so.1
+%endif

 /%{_lib}/libBrokenLocale-%{glibc_major_version}.so
 /%{_lib}/libBrokenLocale.so.1
--- a/glibc-utils.changes
+++ b/glibc-utils.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 18 09:28:23 UTC 2013 - schwab@suse.de
+
+- Update crypt ABI for aarch64
+- Use lib64 for aarch64 and add link for /lib/ld-linux-aarch64.so.1
+- Don't build profiling libraries for aarch64
+
 -------------------------------------------------------------------
 Tue Feb  5 09:28:44 UTC 2013 - schwab@suse.de

--- a/glibc-utils.spec
+++ b/glibc-utils.spec
@ -61,7 +61,12 @@ BuildRequires:  gd-devel
 %define build_html 0
 %else
 # Default:
+%ifarch aarch64
+# aarch64 doesn't support -pg yet
+%define build_profile 0
+%else
 %define build_profile 1
+%endif
 %define build_locales 1
 %define build_html 1
 %endif
@ -249,6 +254,8 @@ Patch2008:      glibc-ld-profile.patch
 Patch2009:      pthread-cond-timedwait-i486.patch
 # PATCH-FIX-OPENSUSE Properly check for short writes when sending the response in nscd
 Patch2010:      nscd-short-write.patch
+# PATCH-FIX-OPENSUSE Use lib64 for aarch64
+Patch2011:      glibc-aarch64-lib64.patch

 %description
 The glibc-utils package contains mtrace, a memory leak tracer and
@ -456,6 +463,7 @@ rm nscd/s-stamp
 # %patch2008 -p1
 %patch2009 -p1
 %patch2010 -p1
+%patch2011 -p1

 #
 # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed!
@ -819,6 +827,10 @@ cp -av bits/stdio-lock.h %{buildroot}%{_includedir}/bits/stdio-lock.h
 	mkdir %{buildroot}/lib
 	ln -sf ../%{_lib}/ld-%{glibc_major_version}.so %{buildroot}/lib/ld64.so.1
 %endif
+%ifarch aarch64
+mkdir %{buildroot}/lib
+ln -sf ../%{_lib}/ld-%{glibc_major_version}.so %{buildroot}/lib/ld-linux-aarch64.so.1
+%endif

 # Miscelanna:

@ -1057,6 +1069,10 @@ exit 0
 %ifarch %ix86 %sparc
 /%{_lib}/ld-linux.so.2
 %endif
+%ifarch aarch64
+/lib/ld-linux-aarch64.so.1
+/%{_lib}/ld-linux-aarch64.so.1
+%endif

 /%{_lib}/libBrokenLocale-%{glibc_major_version}.so
 /%{_lib}/libBrokenLocale.so.1
--- a/glibc.changes
+++ b/glibc.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 18 09:28:23 UTC 2013 - schwab@suse.de
+
+- Update crypt ABI for aarch64
+- Use lib64 for aarch64 and add link for /lib/ld-linux-aarch64.so.1
+- Don't build profiling libraries for aarch64
+
 -------------------------------------------------------------------
 Tue Feb  5 09:28:44 UTC 2013 - schwab@suse.de

--- a/glibc.spec
+++ b/glibc.spec
@ -62,7 +62,12 @@ BuildRequires:  gd-devel
 %define build_html 0
 %else
 # Default:
+%ifarch aarch64
+# aarch64 doesn't support -pg yet
+%define build_profile 0
+%else
 %define build_profile 1
+%endif
 %define build_locales 1
 %define build_html 1
 %endif
@ -250,6 +255,8 @@ Patch2008:      glibc-ld-profile.patch
 Patch2009:      pthread-cond-timedwait-i486.patch
 # PATCH-FIX-OPENSUSE Properly check for short writes when sending the response in nscd
 Patch2010:      nscd-short-write.patch
+# PATCH-FIX-OPENSUSE Use lib64 for aarch64
+Patch2011:      glibc-aarch64-lib64.patch

 %description
 The GNU C Library provides the most important standard libraries used
@ -456,6 +463,7 @@ rm nscd/s-stamp
 # %patch2008 -p1
 %patch2009 -p1
 %patch2010 -p1
+%patch2011 -p1

 #
 # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed!
@ -819,6 +827,10 @@ cp -av bits/stdio-lock.h %{buildroot}%{_includedir}/bits/stdio-lock.h
 	mkdir %{buildroot}/lib
 	ln -sf ../%{_lib}/ld-%{glibc_major_version}.so %{buildroot}/lib/ld64.so.1
 %endif
+%ifarch aarch64
+mkdir %{buildroot}/lib
+ln -sf ../%{_lib}/ld-%{glibc_major_version}.so %{buildroot}/lib/ld-linux-aarch64.so.1
+%endif

 # Miscelanna:

@ -1057,6 +1069,10 @@ exit 0
 %ifarch %ix86 %sparc
 /%{_lib}/ld-linux.so.2
 %endif
+%ifarch aarch64
+/lib/ld-linux-aarch64.so.1
+/%{_lib}/ld-linux-aarch64.so.1
+%endif

 /%{_lib}/libBrokenLocale-%{glibc_major_version}.so
 /%{_lib}/libBrokenLocale.so.1