[PATCH] dl-dtprocnum.h
Jakub Jelinek
jakub@redhat.com
Fri Jun 9 14:57:00 GMT 2000
Hi!
Installed <link.h> uses DT_THISPROCNUM, but as that is defined by a private
header, nothing including it will compile.
What is the reason why dl-dtprocnum.h is private to glibc?
Namespace issue? In that case it should be called __DT_THISPROCNUM or
whatever and public anyway.
Patch below makes it public header bits/dl-dtprocnum.h.
2000-06-09 Jakub Jelinek <jakub@redhat.com>
* elf/elf.h: Include bits/dl-dtprocnum.h.
* elf/Makefile (headers): Add bits/dl-dtprocnum.h.
(distribute): Remove dl-dtprocnum.h.
* include/elf.h: Don't include dl-dtprocnum.h.
* sysdeps/generic/dl-dtprocnum.h: Moved...
* sysdeps/generic/bits/dl-dtprocnum.h: ...here.
* sysdeps/ia64/dl-dtprocnum.h: Moved...
* sysdeps/ia64/bits/dl-dtprocnum.h: ...here.
* sysdeps/mips/dl-dtprocnum.h: Moved...
* sysdeps/mips/bits/dl-dtprocnum.h: ...here.
* sysdeps/sparc/dl-dtprocnum.h: Moved...
* sysdeps/sparc/bits/dl-dtprocnum.h: ...here.
--- libc/elf/elf.h.jj Thu Jun 8 10:34:29 2000
+++ libc/elf/elf.h Fri Jun 9 23:38:38 2000
@@ -21,6 +21,7 @@
#define _ELF_H 1
#include <features.h>
+#include <bits/dl-dtprocnum.h>
__BEGIN_DECLS
--- libc/elf/Makefile.jj Thu Jun 8 10:34:29 2000
+++ libc/elf/Makefile Fri Jun 9 23:39:36 2000
@@ -20,7 +20,7 @@
subdir := elf
-headers = elf.h bits/elfclass.h link.h
+headers = elf.h bits/elfclass.h link.h bits/dl-dtprocnum.h
routines = $(dl-routines) dl-open dl-close dl-symbol dl-support \
dl-addr enbl-secure dl-profstub dl-origin dl-libc dl-sym
@@ -43,7 +43,7 @@ distribute := $(rtld-routines:=.c) dynam
testobj1.c testobj2.c testobj3.c testobj4.c testobj5.c \
testobj6.c testobj1_1.c failobj.c \
ldconfig.h ldconfig.c cache.c readlib.c readelflib.c \
- dep1.c dep2.c dep3.c dep4.c dl-dtprocnum.h
+ dep1.c dep2.c dep3.c dep4.c
include ../Makeconfig
--- libc/include/elf.h.jj Fri Jun 9 23:36:31 2000
+++ libc/include/elf.h Fri Jun 9 23:36:49 2000
@@ -1,6 +1 @@
-#ifndef _ELF_H
-# include <elf/elf.h>
-/* Some information which is not meant for the public and therefore not
- in <elf.h>. */
-# include <dl-dtprocnum.h>
-#endif
+#include <elf/elf.h>
--- libc/sysdeps/generic/bits/dl-dtprocnum.h.jj Fri Jun 9 23:34:09 2000
+++ libc/sysdeps/generic/bits/dl-dtprocnum.h Fri Jun 9 23:32:11 2000
@@ -0,0 +1,28 @@
+/* Configuration of lookup functions.
+ Copyright (C) 2000 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _DL_DTPROCNUM_H
+#define _DL_DTPROCNUM_H 1
+
+/* Number of extra dynamic section entries for this architecture. By
+ default there are none. */
+#define DT_THISPROCNUM 0
+
+#endif /* _DL_DTPROCNUM_H */
+
--- libc/sysdeps/generic/dl-dtprocnum.h.jj Thu Jun 8 10:35:14 2000
+++ libc/sysdeps/generic/dl-dtprocnum.h Fri Jun 9 23:34:09 2000
@@ -1,22 +0,0 @@
-/* Configuration of lookup functions.
- Copyright (C) 2000 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 Library General Public License as
- published by the Free Software Foundation; either version 2 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-/* Number of extra dynamic section entries for this architecture. By
- default there are none. */
-#define DT_THISPROCNUM 0
--- libc/sysdeps/ia64/bits/dl-dtprocnum.h.jj Fri Jun 9 23:34:09 2000
+++ libc/sysdeps/ia64/bits/dl-dtprocnum.h Fri Jun 9 23:31:12 2000
@@ -0,0 +1,27 @@
+/* Configuration of lookup functions. IA-64 version.
+ Copyright (C) 2000 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _DL_DTPROCNUM_H
+#define _DL_DTPROCNUM_H 1
+
+/* Number of extra dynamic section entries for this architecture. By
+ default there are none. */
+#define DT_THISPROCNUM DT_IA_64_NUM
+
+#endif /* _DL_DTPROC_NUM_H */
--- libc/sysdeps/ia64/dl-dtprocnum.h.jj Thu Jun 8 10:35:22 2000
+++ libc/sysdeps/ia64/dl-dtprocnum.h Fri Jun 9 23:34:09 2000
@@ -1,22 +0,0 @@
-/* Configuration of lookup functions. IA-64 version.
- Copyright (C) 2000 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 Library General Public License as
- published by the Free Software Foundation; either version 2 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-/* Number of extra dynamic section entries for this architecture. By
- default there are none. */
-#define DT_THISPROCNUM DT_IA_64_NUM
--- libc/sysdeps/mips/bits/dl-dtprocnum.h.jj Fri Jun 9 23:34:09 2000
+++ libc/sysdeps/mips/bits/dl-dtprocnum.h Fri Jun 9 23:31:33 2000
@@ -0,0 +1,27 @@
+/* Configuration of lookup functions. MIPS version.
+ Copyright (C) 2000 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _DL_DTPROCNUM_H
+#define _DL_DTPROCNUM_H 1
+
+/* Number of extra dynamic section entries for this architecture. By
+ default there are none. */
+#define DT_THISPROCNUM DT_MIPS_NUM
+
+#endif /* _DL_DTPROCNUM_H */
--- libc/sysdeps/mips/dl-dtprocnum.h.jj Thu Jun 8 10:35:30 2000
+++ libc/sysdeps/mips/dl-dtprocnum.h Fri Jun 9 23:34:09 2000
@@ -1,22 +0,0 @@
-/* Configuration of lookup functions. MIPS version.
- Copyright (C) 2000 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 Library General Public License as
- published by the Free Software Foundation; either version 2 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-/* Number of extra dynamic section entries for this architecture. By
- default there are none. */
-#define DT_THISPROCNUM DT_MIPS_NUM
--- libc/sysdeps/sparc/dl-dtprocnum.h.jj Thu Jun 8 10:35:33 2000
+++ libc/sysdeps/sparc/dl-dtprocnum.h Fri Jun 9 23:34:09 2000
@@ -1,22 +0,0 @@
-/* Configuration of lookup functions. SPARC version.
- Copyright (C) 2000 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 Library General Public License as
- published by the Free Software Foundation; either version 2 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-/* Number of extra dynamic section entries for this architecture. By
- default there are none. */
-#define DT_THISPROCNUM DT_SPARC_NUM
--- libc/sysdeps/sparc/bits/dl-dtprocnum.h.jj Fri Jun 9 23:34:09 2000
+++ libc/sysdeps/sparc/bits/dl-dtprocnum.h Fri Jun 9 23:31:53 2000
@@ -0,0 +1,27 @@
+/* Configuration of lookup functions. SPARC version.
+ Copyright (C) 2000 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _DL_DTPROCNUM_H
+#define _DL_DTPROCNUM_H 1
+
+/* Number of extra dynamic section entries for this architecture. By
+ default there are none. */
+#define DT_THISPROCNUM DT_SPARC_NUM
+
+#endif /* _DL_DTPROCNUM_H */
Jakub
More information about the Libc-hacker
mailing list