[glibc] 01/01: debian/patches/any/local-ldso-disable-hwcap.diff: use __access_noerrno instead of __access. Closes: #877493.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit ee99e1b2f1112cec3799f9c9360484bef45be089
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Wed Dec 6 23:19:45 2017 +0100
debian/patches/any/local-ldso-disable-hwcap.diff: use __access_noerrno instead of __access. Closes: #877493.
---
debian/changelog | 2 ++
debian/patches/any/local-ldso-disable-hwcap.diff | 12 ++++++------
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0b98f02..dc8eb20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ glibc (2.25-4) UNRELEASED; urgency=medium
* debian/control.in/libc: add conflicts with libc0.1-i686 on kfreebsd-i386
and libc6-i686 on i386, to make sure the transitional packages are not
kept when upgrading from stretch.
+ * debian/patches/any/local-ldso-disable-hwcap.diff: use __access_noerrno
+ instead of __access. Closes: #877493.
-- Aurelien Jarno <aurel32@debian.org> Sat, 02 Dec 2017 13:13:06 +0100
diff --git a/debian/patches/any/local-ldso-disable-hwcap.diff b/debian/patches/any/local-ldso-disable-hwcap.diff
index b4ae074..a3f3624 100644
--- a/debian/patches/any/local-ldso-disable-hwcap.diff
+++ b/debian/patches/any/local-ldso-disable-hwcap.diff
@@ -22,11 +22,11 @@
struct r_strlenpair *result;
struct r_strlenpair *rp;
char *cp;
-@@ -417,8 +417,22 @@
+@@ -111,8 +113,22 @@
/* For TLS enabled builds always add 'tls'. */
++cnt;
-+ if (__access ("/etc/ld.so.nohwcap", F_OK) == 0)
++ if (__access_noerrno ("/etc/ld.so.nohwcap", F_OK) == 0)
+ {
+ /* If hwcap is disabled, we only have the base directory to search. */
+ result = (struct r_strlenpair *) malloc (sizeof (*result));
@@ -46,7 +46,7 @@
m = 0;
#ifdef NEED_DL_SYSINFO_DSO
if (dsocaps != NULL)
-@@ -496,8 +510,11 @@
+@@ -192,8 +208,11 @@
*sz = 1 << cnt;
result = (struct r_strlenpair *) malloc (*sz * sizeof (*result) + total);
if (result == NULL)
@@ -70,17 +70,17 @@
/* This is where the strings start. */
cache_data = (const char *) cache_new;
-@@ -255,6 +256,9 @@
+@@ -258,6 +260,9 @@
if (platform != (uint64_t) -1)
platform = 1ULL << platform;
-+ if (__access ("/etc/ld.so.nohwcap", F_OK) == 0)
++ if (__access_noerrno ("/etc/ld.so.nohwcap", F_OK) == 0)
+ disable_hwcap = 1;
+
#define _DL_HWCAP_TLS_MASK (1LL << 63)
uint64_t hwcap_exclude = ~((GLRO(dl_hwcap) & GLRO(dl_hwcap_mask))
| _DL_HWCAP_PLATFORM | _DL_HWCAP_TLS_MASK);
-@@ -265,6 +269,8 @@
+@@ -268,6 +273,8 @@
continue; \
if (GLRO(dl_osversion) && lib->osversion > GLRO(dl_osversion)) \
continue; \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: