From 6bd976963f65990e1099eb4e08946bdb5191dc9c Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 30 May 2012 15:21:55 -0700 Subject: [PATCH] Use x86_64 bits/{link.h,linkmap.h} for i386/x86_64 --- ChangeLog | 7 ++++ sysdeps/i386/bits/link.h | 59 ---------------------------------- sysdeps/i386/bits/linkmap.h | 6 ---- sysdeps/{x86_64 => x86}/bits/link.h | 0 sysdeps/{x86_64 => x86}/bits/linkmap.h | 0 5 files changed, 7 insertions(+), 65 deletions(-) delete mode 100644 sysdeps/i386/bits/link.h delete mode 100644 sysdeps/i386/bits/linkmap.h rename sysdeps/{x86_64 => x86}/bits/link.h (100%) rename sysdeps/{x86_64 => x86}/bits/linkmap.h (100%) diff --git a/ChangeLog b/ChangeLog index 2f9d7a5..735aba5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,13 @@ 2012-05-30 H.J. Lu [BZ #14117] + * sysdeps/i386/bits/link.h: Removed. + * sysdeps/i386/bits/linkmap.h: Likewise. + * sysdeps/x86_64/bits/link.h: Renamed to ... + * sysdeps/x86/bits/link.h: This. + * sysdeps/x86_64/bits/linkmap.h: Renamed to ... + * sysdeps/x86/bits/linkmap.h: This. + * sysdeps/i386/bits/endian.h: Removed. * sysdeps/x86_64/bits/endian.h: Renamed to ... * sysdeps/x86/bits/endian.h: This. diff --git a/sysdeps/i386/bits/link.h b/sysdeps/i386/bits/link.h deleted file mode 100644 index 1a6d51a..0000000 --- a/sysdeps/i386/bits/link.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright (C) 2004, 2005, 2009 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 _LINK_H -# error "Never include directly; use instead." -#endif - - -/* Registers for entry into PLT on IA-32. */ -typedef struct La_i86_regs -{ - uint32_t lr_edx; - uint32_t lr_ecx; - uint32_t lr_eax; - uint32_t lr_ebp; - uint32_t lr_esp; -} La_i86_regs; - -/* Return values for calls from PLT on IA-32. */ -typedef struct La_i86_retval -{ - uint32_t lrv_eax; - uint32_t lrv_edx; - long double lrv_st0; - long double lrv_st1; -} La_i86_retval; - - -__BEGIN_DECLS - -extern Elf32_Addr la_i86_gnu_pltenter (Elf32_Sym *__sym, unsigned int __ndx, - uintptr_t *__refcook, - uintptr_t *__defcook, - La_i86_regs *__regs, - unsigned int *__flags, - const char *__symname, - long int *__framesizep); -extern unsigned int la_i86_gnu_pltexit (Elf32_Sym *__sym, unsigned int __ndx, - uintptr_t *__refcook, - uintptr_t *__defcook, - const La_i86_regs *__inregs, - La_i86_retval *__outregs, - const char *__symname); - -__END_DECLS diff --git a/sysdeps/i386/bits/linkmap.h b/sysdeps/i386/bits/linkmap.h deleted file mode 100644 index 978d526..0000000 --- a/sysdeps/i386/bits/linkmap.h +++ /dev/null @@ -1,6 +0,0 @@ -struct link_map_machine - { - Elf32_Addr plt; /* Address of .plt + 0x16 */ - Elf32_Addr gotplt; /* Address of .got + 0x0c */ - void *tlsdesc_table; /* Address of TLS descriptor hash table. */ - }; diff --git a/sysdeps/x86_64/bits/link.h b/sysdeps/x86/bits/link.h similarity index 100% rename from sysdeps/x86_64/bits/link.h rename to sysdeps/x86/bits/link.h diff --git a/sysdeps/x86_64/bits/linkmap.h b/sysdeps/x86/bits/linkmap.h similarity index 100% rename from sysdeps/x86_64/bits/linkmap.h rename to sysdeps/x86/bits/linkmap.h -- 2.7.4