Blame SOURCES/glibc-rh1404435.patch
|
 |
8ae002 |
Remove the "power8" AT_PLATFORM directory
|
|
|
8ae002 |
|
|
|
8ae002 |
Index: b/releng/glibc_post_upgrade.c
|
|
|
8ae002 |
===================================================================
|
|
|
8ae002 |
--- a/releng/glibc_post_upgrade.c
|
|
|
8ae002 |
+++ b/releng/glibc_post_upgrade.c
|
|
|
8ae002 |
@@ -73,14 +73,23 @@ main (void)
|
|
|
8ae002 |
int i, j, fd;
|
|
|
8ae002 |
off_t base;
|
|
|
8ae002 |
ssize_t ret;
|
|
|
8ae002 |
+ const char *remove_dirs[] = {
|
|
|
8ae002 |
#ifdef __i386__
|
|
|
8ae002 |
- const char *remove_dirs[] = { "/lib/tls", "/lib/i686", "/lib/tls/i486", "/lib/tls/i586", "/lib/tls/i686" };
|
|
|
8ae002 |
-#else
|
|
|
8ae002 |
-#ifndef LIBTLS
|
|
|
8ae002 |
-#define LIBTLS "/lib/tls"
|
|
|
8ae002 |
-#endif
|
|
|
8ae002 |
- const char *remove_dirs[] = { LIBTLS };
|
|
|
8ae002 |
-#endif
|
|
|
8ae002 |
+ "/lib/tls", "/lib/i686", "/lib/tls/i486", "/lib/tls/i586", "/lib/tls/i686"
|
|
|
8ae002 |
+#else /* !__i386__ */
|
|
|
8ae002 |
+# ifndef LIBTLS
|
|
|
8ae002 |
+# define LIBTLS "/lib/tls"
|
|
|
8ae002 |
+# endif
|
|
|
8ae002 |
+# if defined (__powerpc64__)
|
|
|
8ae002 |
+ /* Covers both big endian and little endian. */
|
|
|
8ae002 |
+ "/lib64/power8",
|
|
|
8ae002 |
+# elif defined (__powerpc__)
|
|
|
8ae002 |
+ /* Covers 32-bit only (because of the previous conditional). */
|
|
|
8ae002 |
+ "/lib/power8",
|
|
|
8ae002 |
+# endif
|
|
|
8ae002 |
+ LIBTLS
|
|
|
8ae002 |
+#endif /* !__i386__ */
|
|
|
8ae002 |
+ };
|
|
|
8ae002 |
for (j = 0; j < sizeof (remove_dirs) / sizeof (remove_dirs[0]); ++j)
|
|
|
8ae002 |
{
|
|
|
8ae002 |
size_t rmlen = strlen (remove_dirs[j]);
|