diff options
Diffstat (limited to 'sysdeps/s390')
-rw-r--r-- | sysdeps/s390/asm-syntax.h | 8 | ||||
-rw-r--r-- | sysdeps/s390/s390-32/sysdep.h | 12 | ||||
-rw-r--r-- | sysdeps/s390/s390-64/sysdep.h | 12 |
3 files changed, 4 insertions, 28 deletions
diff --git a/sysdeps/s390/asm-syntax.h b/sysdeps/s390/asm-syntax.h index d1cd80f109..a1d7b5e74b 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 f2d5bada88..8cb8005a58 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 75fee7380d..68903df64e 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) \ |