r5724 - in glibc-package/branches/eglibc-2.18/debian: . patches patches/kfreebsd
Author: ps-guest
Date: 2013-10-13 10:48:16 +0000 (Sun, 13 Oct 2013)
New Revision: 5724
Added:
glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/submitted-auxv.diff
Modified:
glibc-package/branches/eglibc-2.18/debian/changelog
glibc-package/branches/eglibc-2.18/debian/patches/series
Log:
add kfreebsd/submitted-auxv.diff
Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2013-10-13 10:42:44 UTC (rev 5723)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2013-10-13 10:48:16 UTC (rev 5724)
@@ -65,6 +65,7 @@
* kfreebsd/local-fbtl.diff: likewise
* update symbols file for kfreebsd
* add kfreebsd/submitted-waitid.diff
+ * add kfreebsd/submitted-auxv.diff. Closes: #717912.
-- Adam Conrad <adconrad@ubuntu.com> Sun, 25 Aug 2013 14:59:44 -0600
Added: glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/submitted-auxv.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/submitted-auxv.diff (rev 0)
+++ glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/submitted-auxv.diff 2013-10-13 10:48:16 UTC (rev 5724)
@@ -0,0 +1,192 @@
+https://sourceware.org/bugzilla/show_bug.cgi?id=15794
+
+diff --git a/bits/auxv.h b/bits/auxv.h
+new file mode 100644
+index 0000000..76701c3
+--- /dev/null
++++ b/bits/auxv.h
+@@ -0,0 +1,76 @@
++/* Copyright (C) 1995-2013 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <http://www.gnu.org/licenses/>. */
++
++/* Legal values for a_type (entry type). */
++
++#define AT_NULL 0 /* End of vector */
++#define AT_IGNORE 1 /* Entry should be ignored */
++#define AT_EXECFD 2 /* File descriptor of program */
++#define AT_PHDR 3 /* Program headers for program */
++#define AT_PHENT 4 /* Size of program header entry */
++#define AT_PHNUM 5 /* Number of program headers */
++#define AT_PAGESZ 6 /* System page size */
++#define AT_BASE 7 /* Base address of interpreter */
++#define AT_FLAGS 8 /* Flags */
++#define AT_ENTRY 9 /* Entry point of program */
++#define AT_NOTELF 10 /* Program is not ELF */
++#define AT_UID 11 /* Real uid */
++#define AT_EUID 12 /* Effective uid */
++#define AT_GID 13 /* Real gid */
++#define AT_EGID 14 /* Effective gid */
++#define AT_CLKTCK 17 /* Frequency of times() */
++
++/* Some more special a_type values describing the hardware. */
++#define AT_PLATFORM 15 /* String identifying platform. */
++#define AT_HWCAP 16 /* Machine-dependent hints about
++ processor capabilities. */
++
++/* This entry gives some information about the FPU initialization
++ performed by the kernel. */
++#define AT_FPUCW 18 /* Used FPU control word. */
++
++/* Cache block sizes. */
++#define AT_DCACHEBSIZE 19 /* Data cache block size. */
++#define AT_ICACHEBSIZE 20 /* Instruction cache block size. */
++#define AT_UCACHEBSIZE 21 /* Unified cache block size. */
++
++/* A special ignored value for PPC, used by the kernel to control the
++ interpretation of the AUXV. Must be > 16. */
++#define AT_IGNOREPPC 22 /* Entry should be ignored. */
++
++#define AT_SECURE 23 /* Boolean, was exec setuid-like? */
++
++#define AT_BASE_PLATFORM 24 /* String identifying real platforms.*/
++
++#define AT_RANDOM 25 /* Address of 16 random bytes. */
++
++#define AT_HWCAP2 26 /* More machine-dependent hints about
++ processor capabilities. */
++
++#define AT_EXECFN 31 /* Filename of executable. */
++
++/* Pointer to the global system page used for system calls and other
++ nice things. */
++#define AT_SYSINFO 32
++#define AT_SYSINFO_EHDR 33
++
++/* Shapes of the caches. Bits 0-3 contains associativity; bits 4-7 contains
++ log2 of line size; mask those to get cache size. */
++#define AT_L1I_CACHESHAPE 34
++#define AT_L1D_CACHESHAPE 35
++#define AT_L2_CACHESHAPE 36
++#define AT_L3_CACHESHAPE 37
+diff --git a/elf/elf.h b/elf/elf.h
+index f372271..cd086ab 100644
+--- a/elf/elf.h
++++ b/elf/elf.h
+@@ -972,66 +972,6 @@ typedef struct
+ } a_un;
+ } Elf64_auxv_t;
+
+-/* Legal values for a_type (entry type). */
+-
+-#define AT_NULL 0 /* End of vector */
+-#define AT_IGNORE 1 /* Entry should be ignored */
+-#define AT_EXECFD 2 /* File descriptor of program */
+-#define AT_PHDR 3 /* Program headers for program */
+-#define AT_PHENT 4 /* Size of program header entry */
+-#define AT_PHNUM 5 /* Number of program headers */
+-#define AT_PAGESZ 6 /* System page size */
+-#define AT_BASE 7 /* Base address of interpreter */
+-#define AT_FLAGS 8 /* Flags */
+-#define AT_ENTRY 9 /* Entry point of program */
+-#define AT_NOTELF 10 /* Program is not ELF */
+-#define AT_UID 11 /* Real uid */
+-#define AT_EUID 12 /* Effective uid */
+-#define AT_GID 13 /* Real gid */
+-#define AT_EGID 14 /* Effective gid */
+-#define AT_CLKTCK 17 /* Frequency of times() */
+-
+-/* Some more special a_type values describing the hardware. */
+-#define AT_PLATFORM 15 /* String identifying platform. */
+-#define AT_HWCAP 16 /* Machine-dependent hints about
+- processor capabilities. */
+-
+-/* This entry gives some information about the FPU initialization
+- performed by the kernel. */
+-#define AT_FPUCW 18 /* Used FPU control word. */
+-
+-/* Cache block sizes. */
+-#define AT_DCACHEBSIZE 19 /* Data cache block size. */
+-#define AT_ICACHEBSIZE 20 /* Instruction cache block size. */
+-#define AT_UCACHEBSIZE 21 /* Unified cache block size. */
+-
+-/* A special ignored value for PPC, used by the kernel to control the
+- interpretation of the AUXV. Must be > 16. */
+-#define AT_IGNOREPPC 22 /* Entry should be ignored. */
+-
+-#define AT_SECURE 23 /* Boolean, was exec setuid-like? */
+-
+-#define AT_BASE_PLATFORM 24 /* String identifying real platforms.*/
+-
+-#define AT_RANDOM 25 /* Address of 16 random bytes. */
+-
+-#define AT_HWCAP2 26 /* More machine-dependent hints about
+- processor capabilities. */
+-
+-#define AT_EXECFN 31 /* Filename of executable. */
+-
+-/* Pointer to the global system page used for system calls and other
+- nice things. */
+-#define AT_SYSINFO 32
+-#define AT_SYSINFO_EHDR 33
+-
+-/* Shapes of the caches. Bits 0-3 contains associativity; bits 4-7 contains
+- log2 of line size; mask those to get cache size. */
+-#define AT_L1I_CACHESHAPE 34
+-#define AT_L1D_CACHESHAPE 35
+-#define AT_L2_CACHESHAPE 36
+-#define AT_L3_CACHESHAPE 37
+-
+ /* Note section contents. Each entry in the note section begins with
+ a header of a fixed form. */
+
+diff --git a/misc/Makefile b/misc/Makefile
+index 5df70e6..3928e08 100644
+--- a/misc/Makefile
++++ b/misc/Makefile
+@@ -32,7 +32,7 @@ headers := sys/uio.h bits/uio.h sys/ioctl.h bits/ioctls.h bits/ioctl-types.h \
+ regexp.h bits/select.h bits/mman.h sys/xattr.h \
+ syslog.h sys/syslog.h \
+ bits/syslog.h bits/syslog-ldbl.h bits/syslog-path.h bits/error.h \
+- bits/select2.h bits/hwcap.h sys/auxv.h
++ bits/select2.h bits/hwcap.h bits/auxv.h sys/auxv.h
+
+ routines := brk sbrk sstk ioctl \
+ readv writev preadv preadv64 pwritev pwritev64 \
+diff --git a/misc/sys/auxv.h b/misc/sys/auxv.h
+index a69250b..ba5022b 100644
+--- a/misc/sys/auxv.h
++++ b/misc/sys/auxv.h
+@@ -20,6 +20,7 @@
+ #define _SYS_AUXV_H 1
+
+ #include <elf.h>
++#include <bits/auxv.h>
+ #include <sys/cdefs.h>
+ #include <bits/hwcap.h>
+
+diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
+index e7b0516..d284a9c 100644
+--- a/sysdeps/generic/ldsodefs.h
++++ b/sysdeps/generic/ldsodefs.h
+@@ -29,6 +29,7 @@
+ #include <stdint.h>
+
+ #include <elf.h>
++#include <bits/auxv.h>
+ #include <dlfcn.h>
+ #include <fpu_control.h>
+ #include <sys/mman.h>
Modified: glibc-package/branches/eglibc-2.18/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/series 2013-10-13 10:42:44 UTC (rev 5723)
+++ glibc-package/branches/eglibc-2.18/debian/patches/series 2013-10-13 10:48:16 UTC (rev 5724)
@@ -143,6 +143,7 @@
kfreebsd/submitted-libc_once.diff
kfreebsd/submitted-waitid.diff
+kfreebsd/submitted-auxv.diff
kfreebsd/local-config_h_in.patch
kfreebsd/local-grantpt.diff
kfreebsd/local-sysdeps.diff
Reply to: