Message ID | 20180512133237.GA30516@gmail.com |
---|---|
State | New |
Headers | show |
Series | x86: Add sysdeps/x86/ldsodefs.h | expand |
On Sat, May 12, 2018 at 06:32:37AM -0700, H.J. Lu wrote: > Merge sysdeps/i386/ldsodefs.h and sysdeps/x86_64/ldsodefs.h into > sysdeps/x86/ldsodefs.h. > > Tested on i686 and x86-64. > > Any comments? Seems reasonable to me. Acked-by: Christian Brauner (Ubuntu) christian@brauner.io > > H.J. > ---- > * 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. > --- > sysdeps/i386/ldsodefs.h | 41 ------------------------------ > sysdeps/{x86_64 => x86}/ldsodefs.h | 14 ++++++++-- > 2 files changed, 12 insertions(+), 43 deletions(-) > delete mode 100644 sysdeps/i386/ldsodefs.h > rename sysdeps/{x86_64 => x86}/ldsodefs.h (79%) > > diff --git a/sysdeps/i386/ldsodefs.h b/sysdeps/i386/ldsodefs.h > deleted file mode 100644 > index 900ae48f6a..0000000000 > --- a/sysdeps/i386/ldsodefs.h > +++ /dev/null > @@ -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 > diff --git a/sysdeps/x86_64/ldsodefs.h b/sysdeps/x86/ldsodefs.h > similarity index 79% > rename from sysdeps/x86_64/ldsodefs.h > rename to sysdeps/x86/ldsodefs.h > index 026fdd28ad..0616215b7a 100644 > --- a/sysdeps/x86_64/ldsodefs.h > +++ b/sysdeps/x86/ldsodefs.h > @@ -1,4 +1,5 @@ > /* Run-time dynamic linker data structures for loaded ELF shared objects. > + X86 version. > Copyright (C) 1995-2018 Free Software Foundation, Inc. > This file is part of the GNU C Library. > > @@ -16,18 +17,24 @@ > License along with the GNU C Library; if not, see > <http://www.gnu.org/licenses/>. */ > > -#ifndef _X86_64_LDSODEFS_H > -#define _X86_64_LDSODEFS_H 1 > +#ifndef _X86_LDSODEFS_H > +#define _X86_LDSODEFS_H 1 > > #include <elf.h> > #include <cpu-features.h> > > +struct La_i86_regs; > +struct La_i86_retval; > struct La_x86_64_regs; > struct La_x86_64_retval; > struct La_x32_regs; > struct La_x32_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); \ > Elf64_Addr (*x86_64_gnu_pltenter) (Elf64_Sym *, unsigned int, \ > uintptr_t *, \ > uintptr_t *, struct La_x86_64_regs *, \ > @@ -39,6 +46,9 @@ struct La_x32_retval; > 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 *); \ > unsigned int (*x86_64_gnu_pltexit) (Elf64_Sym *, unsigned int, \ > uintptr_t *, \ > uintptr_t *, \ > -- > 2.17.0 >
On Mon, May 14, 2018 at 8:20 AM, Christian Brauner <christian@brauner.io> wrote: > On Sat, May 12, 2018 at 06:32:37AM -0700, H.J. Lu wrote: >> Merge sysdeps/i386/ldsodefs.h and sysdeps/x86_64/ldsodefs.h into >> sysdeps/x86/ldsodefs.h. >> >> Tested on i686 and x86-64. >> >> Any comments? > > Seems reasonable to me. > > Acked-by: Christian Brauner (Ubuntu) christian@brauner.io > > I am going to check it in Thanks.
diff --git a/sysdeps/i386/ldsodefs.h b/sysdeps/i386/ldsodefs.h deleted file mode 100644 index 900ae48f6a..0000000000 --- a/sysdeps/i386/ldsodefs.h +++ /dev/null @@ -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 diff --git a/sysdeps/x86_64/ldsodefs.h b/sysdeps/x86/ldsodefs.h similarity index 79% rename from sysdeps/x86_64/ldsodefs.h rename to sysdeps/x86/ldsodefs.h index 026fdd28ad..0616215b7a 100644 --- a/sysdeps/x86_64/ldsodefs.h +++ b/sysdeps/x86/ldsodefs.h @@ -1,4 +1,5 @@ /* Run-time dynamic linker data structures for loaded ELF shared objects. + X86 version. Copyright (C) 1995-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -16,18 +17,24 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef _X86_64_LDSODEFS_H -#define _X86_64_LDSODEFS_H 1 +#ifndef _X86_LDSODEFS_H +#define _X86_LDSODEFS_H 1 #include <elf.h> #include <cpu-features.h> +struct La_i86_regs; +struct La_i86_retval; struct La_x86_64_regs; struct La_x86_64_retval; struct La_x32_regs; struct La_x32_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); \ Elf64_Addr (*x86_64_gnu_pltenter) (Elf64_Sym *, unsigned int, \ uintptr_t *, \ uintptr_t *, struct La_x86_64_regs *, \ @@ -39,6 +46,9 @@ struct La_x32_retval; 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 *); \ unsigned int (*x86_64_gnu_pltexit) (Elf64_Sym *, unsigned int, \ uintptr_t *, \ uintptr_t *, \