From 98ee36c7a44e140e2a85a2c4306e06176fb9e395 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 14 May 2018 09:19:12 -0700 Subject: x86: Add sysdeps/x86/ldsodefs.h 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 --- sysdeps/i386/ldsodefs.h | 41 ----------------------------- sysdeps/x86/ldsodefs.h | 66 +++++++++++++++++++++++++++++++++++++++++++++++ sysdeps/x86_64/ldsodefs.h | 56 ---------------------------------------- 3 files changed, 66 insertions(+), 97 deletions(-) delete mode 100644 sysdeps/i386/ldsodefs.h create mode 100644 sysdeps/x86/ldsodefs.h delete mode 100644 sysdeps/x86_64/ldsodefs.h (limited to 'sysdeps') diff --git a/sysdeps/i386/ldsodefs.h b/sysdeps/i386/ldsodefs.h deleted file mode 100644 index 900ae48..0000000 --- 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 - . */ - -#ifndef _I386_LDSODEFS_H -#define _I386_LDSODEFS_H 1 - -#include -#include - -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 - -#endif diff --git a/sysdeps/x86/ldsodefs.h b/sysdeps/x86/ldsodefs.h new file mode 100644 index 0000000..0616215 --- /dev/null +++ b/sysdeps/x86/ldsodefs.h @@ -0,0 +1,66 @@ +/* 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. + + 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 + . */ + +#ifndef _X86_LDSODEFS_H +#define _X86_LDSODEFS_H 1 + +#include +#include + +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 *, \ + unsigned int *, const char *name, \ + long int *framesizep); \ + Elf32_Addr (*x32_gnu_pltenter) (Elf32_Sym *, unsigned int, uintptr_t *, \ + uintptr_t *, struct La_x32_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 *); \ + unsigned int (*x86_64_gnu_pltexit) (Elf64_Sym *, unsigned int, \ + uintptr_t *, \ + uintptr_t *, \ + const struct La_x86_64_regs *, \ + struct La_x86_64_retval *, \ + const char *); \ + unsigned int (*x32_gnu_pltexit) (Elf32_Sym *, unsigned int, uintptr_t *, \ + uintptr_t *, \ + const struct La_x32_regs *, \ + struct La_x86_64_retval *, \ + const char *) + +#include_next + +#endif diff --git a/sysdeps/x86_64/ldsodefs.h b/sysdeps/x86_64/ldsodefs.h deleted file mode 100644 index 026fdd2..0000000 --- a/sysdeps/x86_64/ldsodefs.h +++ /dev/null @@ -1,56 +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 - . */ - -#ifndef _X86_64_LDSODEFS_H -#define _X86_64_LDSODEFS_H 1 - -#include -#include - -struct La_x86_64_regs; -struct La_x86_64_retval; -struct La_x32_regs; -struct La_x32_retval; - -#define ARCH_PLTENTER_MEMBERS \ - Elf64_Addr (*x86_64_gnu_pltenter) (Elf64_Sym *, unsigned int, \ - uintptr_t *, \ - uintptr_t *, struct La_x86_64_regs *, \ - unsigned int *, const char *name, \ - long int *framesizep); \ - Elf32_Addr (*x32_gnu_pltenter) (Elf32_Sym *, unsigned int, uintptr_t *, \ - uintptr_t *, struct La_x32_regs *, \ - unsigned int *, const char *name, \ - long int *framesizep) - -#define ARCH_PLTEXIT_MEMBERS \ - unsigned int (*x86_64_gnu_pltexit) (Elf64_Sym *, unsigned int, \ - uintptr_t *, \ - uintptr_t *, \ - const struct La_x86_64_regs *, \ - struct La_x86_64_retval *, \ - const char *); \ - unsigned int (*x32_gnu_pltexit) (Elf32_Sym *, unsigned int, uintptr_t *, \ - uintptr_t *, \ - const struct La_x32_regs *, \ - struct La_x86_64_retval *, \ - const char *) - -#include_next - -#endif -- cgit v1.1