e354a5
commit d039da1c00e01f8d3c3d74f439a971eb73e3045e
e354a5
Author: H.J. Lu <hjl.tools@gmail.com>
e354a5
Date:   Wed Jun 26 15:07:18 2019 -0700
e354a5
e354a5
    x86: Add sysdeps/x86/dl-lookupcfg.h
e354a5
    
e354a5
    Since sysdeps/i386/dl-lookupcfg.h and sysdeps/x86_64/dl-lookupcfg.h are
e354a5
    identical, we can replace them with sysdeps/x86/dl-lookupcfg.h.
e354a5
    
e354a5
            * sysdeps/i386/dl-lookupcfg.h: Moved to ...
e354a5
            * sysdeps/x86/dl-lookupcfg.h: Here.
e354a5
            * sysdeps/x86_64/dl-lookupcfg.h: Removed.
e354a5
e354a5
Conflicts:
e354a5
	sysdeps/x86_64/dl-lookupcfg.h
e354a5
	  (Removal after copyright year update.)
e354a5
e354a5
diff --git a/sysdeps/i386/dl-lookupcfg.h b/sysdeps/x86/dl-lookupcfg.h
e354a5
similarity index 100%
e354a5
rename from sysdeps/i386/dl-lookupcfg.h
e354a5
rename to sysdeps/x86/dl-lookupcfg.h
e354a5
diff --git a/sysdeps/x86_64/dl-lookupcfg.h b/sysdeps/x86_64/dl-lookupcfg.h
e354a5
deleted file mode 100644
e354a5
index 5399cf25abde592d..0000000000000000
e354a5
--- a/sysdeps/x86_64/dl-lookupcfg.h
e354a5
+++ /dev/null
e354a5
@@ -1,31 +0,0 @@
e354a5
-/* Configuration of lookup functions.
e354a5
-   Copyright (C) 2005-2018 Free Software Foundation, Inc.
e354a5
-   This file is part of the GNU C Library.
e354a5
-
e354a5
-   The GNU C Library is free software; you can redistribute it and/or
e354a5
-   modify it under the terms of the GNU Lesser General Public
e354a5
-   License as published by the Free Software Foundation; either
e354a5
-   version 2.1 of the License, or (at your option) any later version.
e354a5
-
e354a5
-   The GNU C Library is distributed in the hope that it will be useful,
e354a5
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
e354a5
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
e354a5
-   Lesser General Public License for more details.
e354a5
-
e354a5
-   You should have received a copy of the GNU Lesser General Public
e354a5
-   License along with the GNU C Library; if not, see
e354a5
-   <http://www.gnu.org/licenses/>.  */
e354a5
-
e354a5
-#define DL_UNMAP_IS_SPECIAL
e354a5
-
e354a5
-#include_next <dl-lookupcfg.h>
e354a5
-
e354a5
-/* Address of protected data defined in the shared library may be
e354a5
-   external due to copy relocation.   */
e354a5
-#define DL_EXTERN_PROTECTED_DATA
e354a5
-
e354a5
-struct link_map;
e354a5
-
e354a5
-extern void _dl_unmap (struct link_map *map) attribute_hidden;
e354a5
-
e354a5
-#define DL_UNMAP(map) _dl_unmap (map)