AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-10 07:10:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: Add sysdeps/x86/ldsodefs.h

Browse Source 
Merge sysdeps/i386/ldsodefs.h and sysdeps/x86_64/ldsodefs.h into
sysdeps/x86/ldsodefs.h.

Tested on i686 and x86-64.

	* sysdeps/i386/ldsodefs.h: Removed.
	* sysdeps/x86_64/ldsodefs.h: Moved to ...
	* sysdeps/x86/ldsodefs.h: This.
	(La_i86_regs): New.
	(La_i86_retval): Likewise.
	(ARCH_PLTENTER_MEMBERS): Add i86_gnu_pltenter.
	(ARCH_PLTEXIT_MEMBERS): i86_gnu_pltexit.

Acked-by: Christian Brauner (Ubuntu) christian@brauner.io
This commit is contained in:
H.J. Lu 2018-05-14 09:19:12 -07:00
parent e322ec3282
commit 98ee36c7a4
3 changed files with 22 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2018-05-14 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/i386/ldsodefs.h: Removed.
* sysdeps/x86_64/ldsodefs.h: Moved to ...
* sysdeps/x86/ldsodefs.h: This.
(La_i86_regs): New.
(La_i86_retval): Likewise.
(ARCH_PLTENTER_MEMBERS): Add i86_gnu_pltenter.
(ARCH_PLTEXIT_MEMBERS): i86_gnu_pltexit.
2018-05-14 H.J. Lu <hongjiu.lu@intel.com> 2018-05-14 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/x86_64/multiarch/strlen-avx2.S (STRLEN): Remove the * sysdeps/x86_64/multiarch/strlen-avx2.S (STRLEN): Remove the

41
sysdeps/i386/ldsodefs.h
View File

@ -1,41 +0,0 @@
/* Run-time dynamic linker data structures for loaded ELF shared objects.
Copyright (C) 1995-2018 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/>. */
#ifndef _I386_LDSODEFS_H
#define _I386_LDSODEFS_H 1
#include <elf.h>
#include <cpu-features.h>
struct La_i86_regs;
struct La_i86_retval;
#define ARCH_PLTENTER_MEMBERS \
Elf32_Addr (*i86_gnu_pltenter) (Elf32_Sym *, unsigned int, uintptr_t *, \
uintptr_t *, struct La_i86_regs *, \
unsigned int *, const char *name, \
long int *framesizep)
#define ARCH_PLTEXIT_MEMBERS \
unsigned int (*i86_gnu_pltexit) (Elf32_Sym *, unsigned int, uintptr_t *, \
uintptr_t *, const struct La_i86_regs *, \
struct La_i86_retval *, const char *)
#include_next <ldsodefs.h>
#endif

14
sysdeps/x86_64/ldsodefs.h → sysdeps/x86/ldsodefs.h
View File

@ -1,4 +1,5 @@
/* Run-time dynamic linker data structures for loaded ELF shared objects. /* Run-time dynamic linker data structures for loaded ELF shared objects.
X86 version.
Copyright (C) 1995-2018 Free Software Foundation, Inc. Copyright (C) 1995-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -16,18 +17,24 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#ifndef _X86_64_LDSODEFS_H #ifndef _X86_LDSODEFS_H
#define _X86_64_LDSODEFS_H 1 #define _X86_LDSODEFS_H 1
#include <elf.h> #include <elf.h>
#include <cpu-features.h> #include <cpu-features.h>
struct La_i86_regs;
struct La_i86_retval;
struct La_x86_64_regs; struct La_x86_64_regs;
struct La_x86_64_retval; struct La_x86_64_retval;
struct La_x32_regs; struct La_x32_regs;
struct La_x32_retval; struct La_x32_retval;
#define ARCH_PLTENTER_MEMBERS \ #define ARCH_PLTENTER_MEMBERS \
Elf32_Addr (*i86_gnu_pltenter) (Elf32_Sym *, unsigned int, uintptr_t *, \
uintptr_t *, struct La_i86_regs *, \
unsigned int *, const char *name, \
long int *framesizep); \
Elf64_Addr (*x86_64_gnu_pltenter) (Elf64_Sym *, unsigned int, \ Elf64_Addr (*x86_64_gnu_pltenter) (Elf64_Sym *, unsigned int, \
uintptr_t *, \ uintptr_t *, \
uintptr_t *, struct La_x86_64_regs *, \ uintptr_t *, struct La_x86_64_regs *, \
@ -39,6 +46,9 @@ struct La_x32_retval;
long int *framesizep) long int *framesizep)
#define ARCH_PLTEXIT_MEMBERS \ #define ARCH_PLTEXIT_MEMBERS \
unsigned int (*i86_gnu_pltexit) (Elf32_Sym *, unsigned int, uintptr_t *, \
uintptr_t *, const struct La_i86_regs *, \
struct La_i86_retval *, const char *); \
unsigned int (*x86_64_gnu_pltexit) (Elf64_Sym *, unsigned int, \ unsigned int (*x86_64_gnu_pltexit) (Elf64_Sym *, unsigned int, \
uintptr_t *, \ uintptr_t *, \
uintptr_t *, \ uintptr_t *, \