rpms/glibc
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Remove power6 platform directory (#1522675)

Browse Source
This commit is contained in:
Florian Weimer 2017-12-13 16:26:51 +01:00
parent 08930d16b5
commit a5a7506242
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.26.9000-969-g243b63337c %define glibcsrcdir glibc-2.26.9000-969-g243b63337c
%define glibcversion 2.26.9000 %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 # Pre-release tarballs are pulled in from git using a command that is
# effectively: # effectively:
# #
@ -2034,6 +2034,9 @@ fi
%endif %endif
%changelog %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 * Wed Dec 13 2017 Florian Weimer <fweimer@redhat.com> - 2.26.9000-32
- Obsolete the libcrypt-nss subpackage (#1525396) - Obsolete the libcrypt-nss subpackage (#1525396)
- armhfp: Disable -fstack-clash-protection due to GCC bug (#1522678) - armhfp: Disable -fstack-clash-protection due to GCC bug (#1522678)

13
glibc_post_upgrade.c
View File

@ -73,22 +73,23 @@ main (void)
int i, j, fd; int i, j, fd;
off_t base; off_t base;
ssize_t ret; ssize_t ret;
#ifdef __i386__
const char *remove_dirs[] = const char *remove_dirs[] =
{ {
#if defined (__i386__)
"/lib/tls", "/lib/tls",
"/lib/i686", "/lib/i686",
"/lib/tls/i486", "/lib/tls/i486",
"/lib/tls/i586", "/lib/tls/i586",
"/lib/tls/i686", "/lib/tls/i686",
"/lib/i686/nosegneg", "/lib/i686/nosegneg",
}; #elif defined (__powerpc64__) && _CALL_ELF != 2
"/lib64/power6",
#elif defined (LIBTLS)
LIBTLS,
#else #else
#ifndef LIBTLS "/lib/tls",
#define LIBTLS "/lib/tls"
#endif
const char *remove_dirs[] = { LIBTLS };
#endif #endif
};
for (j = 0; j < sizeof (remove_dirs) / sizeof (remove_dirs[0]); ++j) for (j = 0; j < sizeof (remove_dirs) / sizeof (remove_dirs[0]); ++j)
{ {
size_t rmlen = strlen (remove_dirs[j]); size_t rmlen = strlen (remove_dirs[j]);