about summary refs log tree commit diff
path: root/sysdeps/i386/ldsodefs.h
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2018-05-14 09:19:12 -0700
committerH.J. Lu <hjl.tools@gmail.com>2018-05-14 09:19:41 -0700
commit98ee36c7a44e140e2a85a2c4306e06176fb9e395 (patch)
tree31aedf4be04fdac7373faca158e8d2184ab7ea13 /sysdeps/i386/ldsodefs.h
parente322ec3282648e9f05265d4636719ded754a1c3c (diff)
downloadglibc-98ee36c7a44e140e2a85a2c4306e06176fb9e395.tar.gz
glibc-98ee36c7a44e140e2a85a2c4306e06176fb9e395.tar.xz
glibc-98ee36c7a44e140e2a85a2c4306e06176fb9e395.zip
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
Diffstat (limited to 'sysdeps/i386/ldsodefs.h')
-rw-r--r--sysdeps/i386/ldsodefs.h41
1 files changed, 0 insertions, 41 deletions
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