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