x86: Add sysdeps/x86/dl-lookupcfg.h

Message ID 20190626154049.13306-1-hjl.tools@gmail.com
State New
Headers show
Series
  • x86: Add sysdeps/x86/dl-lookupcfg.h
Related show

Commit Message

H.J. Lu June 26, 2019, 3:40 p.m.
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.
---
 sysdeps/{i386 => x86}/dl-lookupcfg.h |  0
 sysdeps/x86_64/dl-lookupcfg.h        | 31 ----------------------------
 2 files changed, 31 deletions(-)
 rename sysdeps/{i386 => x86}/dl-lookupcfg.h (100%)
 delete mode 100644 sysdeps/x86_64/dl-lookupcfg.h

-- 
2.20.1

Comments

Adhemerval Zanella June 26, 2019, 5:06 p.m. | #1
On 26/06/2019 12:40, H.J. Lu wrote:
> 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.


LGTM, thanks.

> ---

>  sysdeps/{i386 => x86}/dl-lookupcfg.h |  0

>  sysdeps/x86_64/dl-lookupcfg.h        | 31 ----------------------------

>  2 files changed, 31 deletions(-)

>  rename sysdeps/{i386 => x86}/dl-lookupcfg.h (100%)

>  delete mode 100644 sysdeps/x86_64/dl-lookupcfg.h

> 

> diff --git a/sysdeps/i386/dl-lookupcfg.h b/sysdeps/x86/dl-lookupcfg.h

> similarity index 100%

> rename from sysdeps/i386/dl-lookupcfg.h

> rename to 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)

>

Patch

diff --git a/sysdeps/i386/dl-lookupcfg.h b/sysdeps/x86/dl-lookupcfg.h
similarity index 100%
rename from sysdeps/i386/dl-lookupcfg.h
rename to 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)