aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-01-08 02:01:21 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-01-08 02:01:21 +0000
commit10fd25cc3baa3bbce2c00e66bb05e2939ad3239f (patch)
tree29a7770755c5f4033cf5540bda381753fc287e9e
parent5155e70cbe179919d3d10a7b8d91ba9ee775c9fc (diff)
downloadglibc-10fd25cc3baa3bbce2c00e66bb05e2939ad3239f.tar.xz
glibc-10fd25cc3baa3bbce2c00e66bb05e2939ad3239f.zip
Remove HAVE_ELF conditional for ARM.
-rw-r--r--ChangeLog.arm4
-rw-r--r--sysdeps/arm/sysdep.h15
2 files changed, 6 insertions, 13 deletions
diff --git a/ChangeLog.arm b/ChangeLog.arm
index 70bc5404b9..dd88d9ea2d 100644
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,3 +1,7 @@
+2012-01-08 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/arm/sysdep.h: Remove non-ELF support.
+
2012-01-07 Joseph Myers <joseph@codesourcery.com>
* sysdeps/arm/preconfigure: Give error for old-ABI ARM.
diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h
index 5c01ef0e21..62fee04a9e 100644
--- a/sysdeps/arm/sysdep.h
+++ b/sysdeps/arm/sysdep.h
@@ -1,5 +1,6 @@
/* Assembler macros for ARM.
- Copyright (C) 1997, 1998, 2003, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 2003, 2009, 2010, 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
@@ -29,8 +30,6 @@
/* Syntactic details of assembler. */
-#ifdef HAVE_ELF
-
#define ALIGNARG(log2) log2
/* For ELF we need the `.type' directive to make shared libs work right. */
#define ASM_TYPE_DIRECTIVE(name,typearg) .type name,%##typearg;
@@ -42,16 +41,6 @@
#define PLTJMP(_x) _x##(PLT)
-#else
-
-#define ALIGNARG(log2) log2
-#define ASM_TYPE_DIRECTIVE(name,type) /* Nothing is specified. */
-#define ASM_SIZE_DIRECTIVE(name) /* Nothing is specified. */
-
-#define PLTJMP(_x) _x
-
-#endif
-
/* APCS-32 doesn't preserve the condition codes across function call. */
#ifdef __APCS_32__
#define LOADREGS(cond, base, reglist...)\