picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update ARM for ABIVERSION changes.

Browse source
This commit is contained in:
Joseph Myers 2010-03-30 16:26:07 +00:00
parent 8eb49e8ae8
commit 848fa4a9c0
3 changed files with 73 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog.arm
View file

@ -1,3 +1,9 @@
2010-03-30 Joseph Myers <joseph@codesourcery.com>
* sysdeps/arm/dl-machine.h (VALID_ELF_ABIVERSION, VALID_ELF_OSABI,
VALID_ELF_HEADER): Remove.
* sysdeps/unix/sysv/linux/arm/ldsodefs.h: New.
2010-03-26 Thomas Schwinge <thomas@codesourcery.com>
* sysdeps/arm/configure.in: New file.

12
sysdeps/arm/dl-machine.h
View file

@ -1,6 +1,6 @@
/* Machine-dependent ELF dynamic relocation inline functions. ARM version.
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005
Free Software Foundation, Inc.
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,
2006, 2009, 2010 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
@ -26,14 +26,6 @@
#include <sys/param.h>
#include <tls.h>
#define VALID_ELF_ABIVERSION(ver) (ver == 0)
#define VALID_ELF_OSABI(osabi) \
(osabi == ELFOSABI_SYSV || osabi == ELFOSABI_ARM)
#define VALID_ELF_HEADER(hdr,exp,size) \
memcmp (hdr,exp,size-2) == 0 \
&& VALID_ELF_OSABI (hdr[EI_OSABI]) \
&& VALID_ELF_ABIVERSION (hdr[EI_ABIVERSION])
#define CLEAR_CACHE(BEG,END) \
INTERNAL_SYSCALL_ARM (cacheflush, , 3, (BEG), (END), 0)

65
sysdeps/unix/sysv/linux/arm/ldsodefs.h Normal file
View file

@ -0,0 +1,65 @@
/* Run-time dynamic linker data structures for loaded ELF shared objects.
Copyright (C) 2010 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, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#ifndef _ARM_LINUX_LDSODEFS_H
#define _ARM_LINUX_LDSODEFS_H 1
#include_next <ldsodefs.h>
#undef VALID_ELF_HEADER
#undef VALID_ELF_OSABI
#ifdef __ARM_EABI__
#define EXTRA_OSABI ELFOSABI_ARM_AEABI
#else
#define EXTRA_OSABI ELFOSABI_ARM
#endif
#define VALID_ELF_HEADER(hdr,exp,size) \
(memcmp (hdr, exp, size) == 0 \
|| memcmp (hdr, expected2, size) == 0 \
|| memcmp (hdr, expected3, size) == 0)
#define VALID_ELF_OSABI(osabi) (osabi == ELFOSABI_SYSV \
|| osabi == EXTRA_OSABI \
|| osabi == ELFOSABI_LINUX)
#define MORE_ELF_HEADER_DATA \
static const unsigned char expected2[EI_PAD] = \
{ \
[EI_MAG0] = ELFMAG0, \
[EI_MAG1] = ELFMAG1, \
[EI_MAG2] = ELFMAG2, \
[EI_MAG3] = ELFMAG3, \
[EI_CLASS] = ELFW(CLASS), \
[EI_DATA] = byteorder, \
[EI_VERSION] = EV_CURRENT, \
[EI_OSABI] = ELFOSABI_LINUX \
}; \
static const unsigned char expected3[EI_PAD] = \
{ \
[EI_MAG0] = ELFMAG0, \
[EI_MAG1] = ELFMAG1, \
[EI_MAG2] = ELFMAG2, \
[EI_MAG3] = ELFMAG3, \
[EI_CLASS] = ELFW(CLASS), \
[EI_DATA] = byteorder, \
[EI_VERSION] = EV_CURRENT, \
[EI_OSABI] = EXTRA_OSABI \
}
#endif