[Glibc-bsd-commits] r3601 - in trunk/glibc-ports/kfreebsd: . i386/bits i386/elf x86_64/bits x86_64/elf
Petr Salinger
ps-guest at alioth.debian.org
Sun Jul 17 08:17:20 UTC 2011
Author: ps-guest
Date: 2011-07-17 08:17:20 +0000 (Sun, 17 Jul 2011)
New Revision: 3601
Added:
trunk/glibc-ports/kfreebsd/i386/bits/elf.h
trunk/glibc-ports/kfreebsd/x86_64/bits/elf.h
Removed:
trunk/glibc-ports/kfreebsd/i386/elf/elf.h
trunk/glibc-ports/kfreebsd/x86_64/elf/elf.h
Modified:
trunk/glibc-ports/kfreebsd/dl-support.c
trunk/glibc-ports/kfreebsd/dl-sysdep.c
Log:
we cannot just override elf.h, the 2nd one will not be installed
Modified: trunk/glibc-ports/kfreebsd/dl-support.c
===================================================================
--- trunk/glibc-ports/kfreebsd/dl-support.c 2011-07-16 21:36:46 UTC (rev 3600)
+++ trunk/glibc-ports/kfreebsd/dl-support.c 2011-07-17 08:17:20 UTC (rev 3601)
@@ -19,6 +19,7 @@
#define _dl_aux_init _dl_aux_init_ignored_code
#include <elf/dl-support.c>
+#include <bits/elf.h>
#undef _dl_aux_init
#ifdef HAVE_AUX_VECTOR
Modified: trunk/glibc-ports/kfreebsd/dl-sysdep.c
===================================================================
--- trunk/glibc-ports/kfreebsd/dl-sysdep.c 2011-07-16 21:36:46 UTC (rev 3600)
+++ trunk/glibc-ports/kfreebsd/dl-sysdep.c 2011-07-17 08:17:20 UTC (rev 3601)
@@ -32,6 +32,7 @@
# define _dl_sysdep_start _dl_sysdep_start_ignored_code
# define _dl_show_auxv _dl_show_auxv_ignored_code
# include <elf/dl-sysdep.c>
+# include <bits/elf.h>
# undef _dl_sysdep_start
# undef _dl_show_auxv
Copied: trunk/glibc-ports/kfreebsd/i386/bits/elf.h (from rev 3600, trunk/glibc-ports/kfreebsd/i386/elf/elf.h)
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/bits/elf.h (rev 0)
+++ trunk/glibc-ports/kfreebsd/i386/bits/elf.h 2011-07-17 08:17:20 UTC (rev 3601)
@@ -0,0 +1,38 @@
+/* This file defines standard ELF types, structures, and macros.
+ Copyright (C) 1995-2003,2004,2005,2006,2007,2008,2009,2010
+ 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifndef _BITS_ELF_H
+#define _BITS_ELF_H
+
+__BEGIN_DECLS
+
+#define AT_EXECPATH 15 /* Path to the executable. */
+#define AT_CANARY 16 /* Canary for SSP. */
+#define AT_CANARYLEN 17 /* Length of the canary. */
+#define AT_OSRELDATE 18 /* OSRELDATE. */
+#define AT_NCPUS 19 /* Number of CPUs. */
+#define AT_PAGESIZES 20 /* Pagesizes. */
+#define AT_PAGESIZESLEN 21 /* Number of pagesizes. */
+#define AT_STACKPROT 23 /* Initial stack protection. */
+#define AT_COUNT 24 /* Count of defined aux entry types. */
+
+__END_DECLS
+
+#endif /* elf.h */
Deleted: trunk/glibc-ports/kfreebsd/i386/elf/elf.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/elf/elf.h 2011-07-16 21:36:46 UTC (rev 3600)
+++ trunk/glibc-ports/kfreebsd/i386/elf/elf.h 2011-07-17 08:17:20 UTC (rev 3601)
@@ -1,39 +0,0 @@
-/* This file defines standard ELF types, structures, and macros.
- Copyright (C) 1995-2003,2004,2005,2006,2007,2008,2009,2010
- 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, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#ifndef _ELF_H
-
-#include_next <elf/elf.h>
-
-__BEGIN_DECLS
-
-#define AT_EXECPATH 15 /* Path to the executable. */
-#define AT_CANARY 16 /* Canary for SSP. */
-#define AT_CANARYLEN 17 /* Length of the canary. */
-#define AT_OSRELDATE 18 /* OSRELDATE. */
-#define AT_NCPUS 19 /* Number of CPUs. */
-#define AT_PAGESIZES 20 /* Pagesizes. */
-#define AT_PAGESIZESLEN 21 /* Number of pagesizes. */
-#define AT_STACKPROT 23 /* Initial stack protection. */
-#define AT_COUNT 24 /* Count of defined aux entry types. */
-
-__END_DECLS
-
-#endif /* elf.h */
Copied: trunk/glibc-ports/kfreebsd/x86_64/bits/elf.h (from rev 3600, trunk/glibc-ports/kfreebsd/i386/elf/elf.h)
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/bits/elf.h (rev 0)
+++ trunk/glibc-ports/kfreebsd/x86_64/bits/elf.h 2011-07-17 08:17:20 UTC (rev 3601)
@@ -0,0 +1,38 @@
+/* This file defines standard ELF types, structures, and macros.
+ Copyright (C) 1995-2003,2004,2005,2006,2007,2008,2009,2010
+ 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifndef _BITS_ELF_H
+#define _BITS_ELF_H
+
+__BEGIN_DECLS
+
+#define AT_EXECPATH 15 /* Path to the executable. */
+#define AT_CANARY 16 /* Canary for SSP. */
+#define AT_CANARYLEN 17 /* Length of the canary. */
+#define AT_OSRELDATE 18 /* OSRELDATE. */
+#define AT_NCPUS 19 /* Number of CPUs. */
+#define AT_PAGESIZES 20 /* Pagesizes. */
+#define AT_PAGESIZESLEN 21 /* Number of pagesizes. */
+#define AT_STACKPROT 23 /* Initial stack protection. */
+#define AT_COUNT 24 /* Count of defined aux entry types. */
+
+__END_DECLS
+
+#endif /* elf.h */
Deleted: trunk/glibc-ports/kfreebsd/x86_64/elf/elf.h
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/elf/elf.h 2011-07-16 21:36:46 UTC (rev 3600)
+++ trunk/glibc-ports/kfreebsd/x86_64/elf/elf.h 2011-07-17 08:17:20 UTC (rev 3601)
@@ -1,39 +0,0 @@
-/* This file defines standard ELF types, structures, and macros.
- Copyright (C) 1995-2003,2004,2005,2006,2007,2008,2009,2010
- 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, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#ifndef _ELF_H
-
-#include_next <elf/elf.h>
-
-__BEGIN_DECLS
-
-#define AT_EXECPATH 15 /* Path to the executable. */
-#define AT_CANARY 16 /* Canary for SSP */
-#define AT_CANARYLEN 17 /* Length of the canary. */
-#define AT_OSRELDATE 18 /* OSRELDATE. */
-#define AT_NCPUS 19 /* Number of CPUs. */
-#define AT_PAGESIZES 20 /* Pagesizes. */
-#define AT_PAGESIZESLEN 21 /* Number of pagesizes. */
-#define AT_STACKPROT 23 /* Initial stack protection. */
-#define AT_COUNT 24 /* Count of defined aux entry types. */
-
-__END_DECLS
-
-#endif /* elf.h */
More information about the Glibc-bsd-commits
mailing list