aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/s390
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-01-07 20:30:26 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-07 20:30:26 -0500
commit0269750ca60bbfdf92dbe1edfe961adfbc9a34e7 (patch)
treee148227ce15cd7abef82dff9d706d03d0b687292 /sysdeps/s390
parent16dd419d920dbab67ddc6e605bc0dacdc38f463c (diff)
downloadglibc-0269750ca60bbfdf92dbe1edfe961adfbc9a34e7.zip
glibc-0269750ca60bbfdf92dbe1edfe961adfbc9a34e7.tar.gz
glibc-0269750ca60bbfdf92dbe1edfe961adfbc9a34e7.tar.bz2
Remove non-ELF support
Diffstat (limited to 'sysdeps/s390')
-rw-r--r--sysdeps/s390/asm-syntax.h8
-rw-r--r--sysdeps/s390/s390-32/sysdep.h12
-rw-r--r--sysdeps/s390/s390-64/sysdep.h12
3 files changed, 4 insertions, 28 deletions
diff --git a/sysdeps/s390/asm-syntax.h b/sysdeps/s390/asm-syntax.h
index d1cd80f..a1d7b5e 100644
--- a/sysdeps/s390/asm-syntax.h
+++ b/sysdeps/s390/asm-syntax.h
@@ -1,5 +1,5 @@
/* Definitions for S/390 syntax variations.
- Copyright (C) 1992, 1994, 1995, 1997, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1992, 1994, 1995, 1997, 2000, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. Its master source is NOT part of
the C library, however. The master source lives in the GNU MP Library.
@@ -19,11 +19,7 @@
02111-1307 USA. */
#undef ALIGN
-#if defined NOLOG_ALIGN || defined HAVE_ELF
-# define ALIGN(log) .align 1<<log
-#else
-# define ALIGN(log) .align log
-#endif
+#define ALIGN(log) .align 1<<log
#undef L
#ifdef __ELF__
diff --git a/sysdeps/s390/s390-32/sysdep.h b/sysdeps/s390/s390-32/sysdep.h
index f2d5bad..8cb8005 100644
--- a/sysdeps/s390/s390-32/sysdep.h
+++ b/sysdeps/s390/s390-32/sysdep.h
@@ -1,5 +1,5 @@
/* Assembler macros for s390.
- Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2001, 2003, 2012 Free Software Foundation, Inc.
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
This file is part of the GNU C Library.
@@ -24,8 +24,6 @@
/* Syntactic details of assembler. */
-#ifdef HAVE_ELF
-
/* ELF uses byte-counts for .align, most others use log2 of count of bytes. */
#define ALIGNARG(log2) 1<<log2
/* For ELF we need the `.type' directive to make shared libs work right. */
@@ -36,14 +34,6 @@
#undef NO_UNDERSCORES
#define NO_UNDERSCORES
-#else
-
-#define ALIGNARG(log2) log2
-#define ASM_TYPE_DIRECTIVE(name,type) /* Nothing is specified. */
-#define ASM_SIZE_DIRECTIVE(name) /* Nothing is specified. */
-
-#endif
-
/* Define an entry point visible from C. */
#define ENTRY(name) \
diff --git a/sysdeps/s390/s390-64/sysdep.h b/sysdeps/s390/s390-64/sysdep.h
index 75fee73..68903df 100644
--- a/sysdeps/s390/s390-64/sysdep.h
+++ b/sysdeps/s390/s390-64/sysdep.h
@@ -1,5 +1,5 @@
/* Assembler macros for 64 bit S/390.
- Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2003, 2012 Free Software Foundation, Inc.
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
This file is part of the GNU C Library.
@@ -24,8 +24,6 @@
/* Syntactic details of assembler. */
-#ifdef HAVE_ELF
-
/* ELF uses byte-counts for .align, most others use log2 of count of bytes. */
#define ALIGNARG(log2) 1<<log2
/* For ELF we need the `.type' directive to make shared libs work right. */
@@ -36,14 +34,6 @@
#undef NO_UNDERSCORES
#define NO_UNDERSCORES
-#else
-
-#define ALIGNARG(log2) log2
-#define ASM_TYPE_DIRECTIVE(name,type) /* Nothing is specified. */
-#define ASM_SIZE_DIRECTIVE(name) /* Nothing is specified. */
-
-#endif
-
/* Define an entry point visible from C. */
#define ENTRY(name) \