r5439 - in glibc-package/branches/eglibc-2.17/debian: . patches patches/powerpc
Author: adconrad
Date: 2013-01-11 04:17:15 +0000 (Fri, 11 Jan 2013)
New Revision: 5439
Removed:
glibc-package/branches/eglibc-2.17/debian/patches/powerpc/submitted-UAPI_ASM_POWERPC_ELF.diff
Modified:
glibc-package/branches/eglibc-2.17/debian/changelog
glibc-package/branches/eglibc-2.17/debian/patches/series
Log:
debian/patches/powerpc/submitted-UAPI_ASM_POWERPC_ELF.diff: Remove,
as this has been fixed in the 3.7 release and 3.8 kernel headers.
Modified: glibc-package/branches/eglibc-2.17/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-10 10:44:01 UTC (rev 5438)
+++ glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-11 04:17:15 UTC (rev 5439)
@@ -52,6 +52,8 @@
- patches/any/local-revert-fclose-posix2008.diff: Reverted upstream.
- patches/any/local-sunrpc-dos.diff: Dropped, different fix upstream.
- patches/any/cvs-cxxheaders-detection[123].diff: Merged upstream.
+ * debian/patches/powerpc/submitted-UAPI_ASM_POWERPC_ELF.diff: Remove,
+ as this has been fixed in the 3.7 release and 3.8 kernel headers.
* debian/sysdeps/{amd64,i386}.mk: Fix rtlddir for x32 alternate builds.
* debian/sysdeps/{armel,armhf}.mk: Merge multilib configs from Ubuntu.
Deleted: glibc-package/branches/eglibc-2.17/debian/patches/powerpc/submitted-UAPI_ASM_POWERPC_ELF.diff
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/patches/powerpc/submitted-UAPI_ASM_POWERPC_ELF.diff 2013-01-10 10:44:01 UTC (rev 5438)
+++ glibc-package/branches/eglibc-2.17/debian/patches/powerpc/submitted-UAPI_ASM_POWERPC_ELF.diff 2013-01-11 04:17:15 UTC (rev 5439)
@@ -1,23 +0,0 @@
-2012-11-25 Adam Conrad <adconrad@0c3.net>
-
- * sysdeps/unix/sysv/linux/powerpc/sys/procfs.h: Support
- _UAPI_ASM_POWERPC_ELF_H in the Linux 3.7 headers.
-
-More info at: http://article.gmane.org/gmane.linux.kernel.cross-arch/15847
- http://sourceware.org/ml/libc-alpha/2012-11/msg00673.html
-
-diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h b/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h
-index dc41bdf..a8f9878 100644
---- a/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h
-+++ b/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h
-@@ -34,7 +34,9 @@ __BEGIN_DECLS
- /* These definitions are normally provided by ucontext.h via
- asm/sigcontext.h, asm/ptrace.h, and asm/elf.h. Otherwise we define
- them here. */
--#if !defined __PPC64_ELF_H && !defined _ASM_POWERPC_ELF_H
-+#if !defined __PPC64_ELF_H \
-+ && !defined _ASM_POWERPC_ELF_H \
-+ && !defined _UAPI_ASM_POWERPC_ELF_H
- #define ELF_NGREG 48 /* includes nip, msr, lr, etc. */
- #define ELF_NFPREG 33 /* includes fpscr */
- #if __WORDSIZE == 32
Modified: glibc-package/branches/eglibc-2.17/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/patches/series 2013-01-10 10:44:01 UTC (rev 5438)
+++ glibc-package/branches/eglibc-2.17/debian/patches/series 2013-01-11 04:17:15 UTC (rev 5439)
@@ -144,7 +144,6 @@
mips/submitted-wordsize-clang.diff
powerpc/local-math-logb.diff
-powerpc/submitted-UAPI_ASM_POWERPC_ELF.diff
s390/submitted-nexttowardf.diff
Reply to: