r5944 - in glibc-package/branches/eglibc-2.19/debian: . patches patches/any
Author: adconrad
Date: 2014-02-20 09:25:16 +0000 (Thu, 20 Feb 2014)
New Revision: 5944
Added:
glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-sysdeps-auxv.diff
Modified:
glibc-package/branches/eglibc-2.19/debian/changelog
glibc-package/branches/eglibc-2.19/debian/patches/series
Log:
debian/patches/any/submitted-sysdeps-auxv.diff: Fix implicit declaration
when including <sys/auxv.h> in the testsuite by fixing up header guards.
Modified: glibc-package/branches/eglibc-2.19/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/changelog 2014-02-20 09:14:39 UTC (rev 5943)
+++ glibc-package/branches/eglibc-2.19/debian/changelog 2014-02-20 09:25:16 UTC (rev 5944)
@@ -33,6 +33,8 @@
environment for the tst-ftell-partial-wide.out test to find its locales.
* debian/*: Remove references to libbsd-compat.a which is no longer built.
* debian/sysdeps/powerpc.mk: Follow rename of stubs-64.h to stubs-64-v1.h.
+ * debian/patches/any/submitted-sysdeps-auxv.diff: Fix implicit declaration
+ when including <sys/auxv.h> in the testsuite by fixing up header guards.
-- Adam Conrad <adconrad@0c3.net> Sun, 09 Feb 2014 09:46:13 -0700
Added: glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-sysdeps-auxv.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-sysdeps-auxv.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-sysdeps-auxv.diff 2014-02-20 09:25:16 UTC (rev 5944)
@@ -0,0 +1,52 @@
+diff --git a/sysdeps/powerpc/bits/hwcap.h b/sysdeps/powerpc/bits/hwcap.h
+index 1af8c82..7daec91 100644
+--- a/sysdeps/powerpc/bits/hwcap.h
++++ b/sysdeps/powerpc/bits/hwcap.h
+@@ -16,7 +16,7 @@
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+-#ifndef _SYS_AUXV_H
++#if !defined(_SYS_AUXV_H) && !defined(_SYSDEPS_SYSDEP_H)
+ # error "Never include <bits/hwcap.h> directly; use <sys/auxv.h> instead."
+ #endif
+
+diff --git a/sysdeps/powerpc/sysdep.h b/sysdeps/powerpc/sysdep.h
+index 541b657..e6627c0 100644
+--- a/sysdeps/powerpc/sysdep.h
++++ b/sysdeps/powerpc/sysdep.h
+@@ -19,7 +19,7 @@
+ * Powerpc Feature masks for the Aux Vector Hardware Capabilities (AT_HWCAP).
+ * This entry is copied to _dl_hwcap or rtld_global._dl_hwcap during startup.
+ */
+-#define _SYS_AUXV_H 1
++#define _SYSDEPS_SYSDEP_H 1
+ #include <bits/hwcap.h>
+
+ #define PPC_FEATURE_970 (PPC_FEATURE_POWER4 + PPC_FEATURE_HAS_ALTIVEC)
+diff --git a/sysdeps/sparc/bits/hwcap.h b/sysdeps/sparc/bits/hwcap.h
+index cf7c3db..74e1d7f 100644
+--- a/sysdeps/sparc/bits/hwcap.h
++++ b/sysdeps/sparc/bits/hwcap.h
+@@ -16,7 +16,7 @@
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+-#ifndef _SYS_AUXV_H
++#if !defined(_SYS_AUXV_H) && !defined(_SYSDEPS_SYSDEP_H)
+ # error "Never include <bits/hwcap.h> directly; use <sys/auxv.h> instead."
+ #endif
+
+diff --git a/sysdeps/sparc/sysdep.h b/sysdeps/sparc/sysdep.h
+index 1404cc1..a566bd8 100644
+--- a/sysdeps/sparc/sysdep.h
++++ b/sysdeps/sparc/sysdep.h
+@@ -15,7 +15,7 @@
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+-#define _SYS_AUXV_H 1
++#define _SYSDEPS_SYSDEP_H 1
+ #include <bits/hwcap.h>
+
+ #ifdef __ASSEMBLER__
Modified: glibc-package/branches/eglibc-2.19/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/series 2014-02-20 09:14:39 UTC (rev 5943)
+++ glibc-package/branches/eglibc-2.19/debian/patches/series 2014-02-20 09:25:16 UTC (rev 5944)
@@ -220,3 +220,4 @@
any/unsubmitted-tst-tlsmod-as-needed.diff
any/unsubmitted-scanf-includes.diff
any/unsubmitted-tst-ftell-locale.diff
+any/submitted-sysdeps-auxv.diff
Reply to: