about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2019-06-26 15:07:18 -0700
committerH.J. Lu <hjl.tools@gmail.com>2019-06-26 15:07:28 -0700
commitd039da1c00e01f8d3c3d74f439a971eb73e3045e (patch)
treeab2871d5d97a57c11d8a6e3837eed5cad5ff4ac5
parentaa32f5bf0cfd73525fa5d7142e7abf5def87bb08 (diff)
downloadglibc-d039da1c00e01f8d3c3d74f439a971eb73e3045e.tar.gz
glibc-d039da1c00e01f8d3c3d74f439a971eb73e3045e.tar.xz
glibc-d039da1c00e01f8d3c3d74f439a971eb73e3045e.zip
x86: Add sysdeps/x86/dl-lookupcfg.h
Since sysdeps/i386/dl-lookupcfg.h and sysdeps/x86_64/dl-lookupcfg.h are
identical, we can replace them with sysdeps/x86/dl-lookupcfg.h.

	* sysdeps/i386/dl-lookupcfg.h: Moved to ...
	* sysdeps/x86/dl-lookupcfg.h: Here.
	* sysdeps/x86_64/dl-lookupcfg.h: Removed.
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/x86/dl-lookupcfg.h (renamed from sysdeps/i386/dl-lookupcfg.h)0
-rw-r--r--sysdeps/x86_64/dl-lookupcfg.h31
3 files changed, 6 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index ac4aba09ba..c10f372784 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-06-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/i386/dl-lookupcfg.h: Moved to ...
+	* sysdeps/x86/dl-lookupcfg.h: Here.
+	* sysdeps/x86_64/dl-lookupcfg.h: Removed.
+
 2019-06-26  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	* sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
diff --git a/sysdeps/i386/dl-lookupcfg.h b/sysdeps/x86/dl-lookupcfg.h
index 52898de030..52898de030 100644
--- a/sysdeps/i386/dl-lookupcfg.h
+++ b/sysdeps/x86/dl-lookupcfg.h
diff --git a/sysdeps/x86_64/dl-lookupcfg.h b/sysdeps/x86_64/dl-lookupcfg.h
deleted file mode 100644
index 52898de030..0000000000
--- a/sysdeps/x86_64/dl-lookupcfg.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Configuration of lookup functions.
-   Copyright (C) 2005-2019 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/>.  */
-
-#define DL_UNMAP_IS_SPECIAL
-
-#include_next <dl-lookupcfg.h>
-
-/* Address of protected data defined in the shared library may be
-   external due to copy relocation.   */
-#define DL_EXTERN_PROTECTED_DATA
-
-struct link_map;
-
-extern void _dl_unmap (struct link_map *map) attribute_hidden;
-
-#define DL_UNMAP(map) _dl_unmap (map)