From a5a75062423efd916b908a2c6225d030233c13fa Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Wed, 13 Dec 2017 16:26:51 +0100
Subject: [PATCH] Remove power6 platform directory (#1522675)

---
 glibc.spec           |  5 ++++-
 glibc_post_upgrade.c | 13 +++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/glibc.spec b/glibc.spec
index 400b8cd..519dc31 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir glibc-2.26.9000-969-g243b63337c
 %define glibcversion 2.26.9000
-%define glibcrelease 32%{?dist}
+%define glibcrelease 33%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -2034,6 +2034,9 @@ fi
 %endif
 
 %changelog
+* Wed Dec 13 2017 Florian Weimer <fweimer@redhat.com> - 2.26.9000-33
+- Remove power6 platform directory (#1522675)
+
 * Wed Dec 13 2017 Florian Weimer <fweimer@redhat.com> - 2.26.9000-32
 - Obsolete the libcrypt-nss subpackage (#1525396)
 - armhfp: Disable -fstack-clash-protection due to GCC bug (#1522678)
diff --git a/glibc_post_upgrade.c b/glibc_post_upgrade.c
index e5b72a0..ae48737 100644
--- a/glibc_post_upgrade.c
+++ b/glibc_post_upgrade.c
@@ -73,22 +73,23 @@ main (void)
   int i, j, fd;
   off_t base;
   ssize_t ret;
-#ifdef __i386__
   const char *remove_dirs[] =
     {
+#if defined (__i386__)
       "/lib/tls",
       "/lib/i686",
       "/lib/tls/i486",
       "/lib/tls/i586",
       "/lib/tls/i686",
       "/lib/i686/nosegneg",
-    };
+#elif defined (__powerpc64__) && _CALL_ELF != 2
+      "/lib64/power6",
+#elif defined (LIBTLS)
+      LIBTLS,
 #else
-#ifndef LIBTLS
-#define LIBTLS "/lib/tls"
-#endif
-  const char *remove_dirs[] = { LIBTLS };
+      "/lib/tls",
 #endif
+    };
   for (j = 0; j < sizeof (remove_dirs) / sizeof (remove_dirs[0]); ++j)
     {
       size_t rmlen = strlen (remove_dirs[j]);