diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-04-21 10:03:39 -0700 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-04-21 10:03:39 -0700 |
| commit | 8466459037515723689f06c2cf7a79f1083f5d21 (patch) | |
| tree | 38b9f1bd7f409db9953e30147668e8e8f7f74c43 /sysdeps/arm | |
| parent | 1f60a18d81fe045ed611079ef1e9090ac89e6133 (diff) | |
| download | glibc-8466459037515723689f06c2cf7a79f1083f5d21.zip glibc-8466459037515723689f06c2cf7a79f1083f5d21.tar.gz glibc-8466459037515723689f06c2cf7a79f1083f5d21.tar.bz2 | |
Remove ARM EABI/old-ABI conditionals.
Diffstat (limited to 'sysdeps/arm')
| -rw-r--r-- | sysdeps/arm/shlib-versions | 1 | ||||
| -rw-r--r-- | sysdeps/arm/start.S | 5 | ||||
| -rw-r--r-- | sysdeps/arm/sysdep.h | 8 |
3 files changed, 4 insertions, 10 deletions
diff --git a/sysdeps/arm/shlib-versions b/sysdeps/arm/shlib-versions index 491dd0a..626d58b 100644 --- a/sysdeps/arm/shlib-versions +++ b/sysdeps/arm/shlib-versions @@ -1,4 +1,3 @@ arm.*-.*-linux-gnueabi.* DEFAULT GLIBC_2.4 arm.*-.*-linux-gnueabi.* ld=ld-linux.so.3 -arm.*-.*-linux.* ld=ld-linux.so.2 diff --git a/sysdeps/arm/start.S b/sysdeps/arm/start.S index a857d8b..7f3de8c 100644 --- a/sysdeps/arm/start.S +++ b/sysdeps/arm/start.S @@ -1,6 +1,5 @@ /* Startup code for ARM & ELF - Copyright (C) 1995, 1996, 1997, 1998, 2001, 2002, 2005, 2008 - Free Software Foundation, Inc. + Copyright (C) 1995-2012 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 @@ -58,14 +57,12 @@ NULL */ -#if defined(__ARM_EABI__) /* Tag_ABI_align8_preserved: This code preserves 8-byte alignment in any callee. */ .eabi_attribute 25, 1 /* Tag_ABI_align8_needed: This code may require 8-byte alignment from the caller. */ .eabi_attribute 24, 1 -#endif #if defined(__thumb2__) .thumb diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h index 6d15f79..7800456 100644 --- a/sysdeps/arm/sysdep.h +++ b/sysdeps/arm/sysdep.h @@ -77,8 +77,8 @@ /* If compiled for profiling, call `mcount' at the start of each function. */ #ifdef PROF -/* Call __gnu_mcount_nc if GCC >= 4.4 and abi = EABI. */ -#if __GNUC_PREREQ(4,4) && defined(__ARM_EABI__) +/* Call __gnu_mcount_nc if GCC >= 4.4. */ +#if __GNUC_PREREQ(4,4) #define CALL_MCOUNT \ str lr,[sp, #-4]!; \ cfi_adjust_cfa_offset (4); \ @@ -104,19 +104,17 @@ on this system, the asm identifier `syscall_error' intrudes on the C name space. Make sure we use an innocuous name. */ #define syscall_error __syscall_error -#if __GNUC_PREREQ(4,4) && defined(__ARM_EABI__) +#if __GNUC_PREREQ(4,4) #define mcount __gnu_mcount_nc #else #define mcount _mcount #endif -#if defined(__ARM_EABI__) /* Tag_ABI_align8_preserved: This code preserves 8-byte alignment in any callee. */ .eabi_attribute 25, 1 /* Tag_ABI_align8_needed: This code may require 8-byte alignment from the caller. */ .eabi_attribute 24, 1 -#endif #endif /* __ASSEMBLER__ */ |