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