aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/i386/asm-syntax.h8
-rw-r--r--sysdeps/i386/sysdep.h16
-rw-r--r--sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h2
-rw-r--r--sysdeps/mach/sysdep.h4
-rw-r--r--sysdeps/powerpc/powerpc32/Makefile3
-rw-r--r--sysdeps/powerpc/powerpc64/Makefile2
-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
-rw-r--r--sysdeps/sh/sysdep.h13
-rw-r--r--sysdeps/unix/sparc/sysdep.h12
-rw-r--r--sysdeps/wordsize-32/divdi3.c4
-rw-r--r--sysdeps/x86_64/sysdep.h18
13 files changed, 17 insertions, 97 deletions
diff --git a/sysdeps/i386/asm-syntax.h b/sysdeps/i386/asm-syntax.h
index e59e633..19510e0 100644
--- a/sysdeps/i386/asm-syntax.h
+++ b/sysdeps/i386/asm-syntax.h
@@ -1,5 +1,5 @@
/* Definitions for x86 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/i386/sysdep.h b/sysdeps/i386/sysdep.h
index a8a9e57..5a1f693 100644
--- a/sysdeps/i386/sysdep.h
+++ b/sysdeps/i386/sysdep.h
@@ -1,5 +1,5 @@
/* Assembler macros for i386.
- Copyright (C) 1991-93,95,96,98,2002,2003,2005,2006,2011
+ Copyright (C) 1991-93,95,96,98,2002,2003,2005,2006,2011,2012
Free Software Foundation, Inc.
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.
@@ -160,11 +150,7 @@ __i686.get_pc_thunk.reg: \
/* Local label name for asm code. */
#ifndef L
-#ifdef HAVE_ELF
#define L(name) .L##name
-#else
-#define L(name) name
-#endif
#endif
#define atom_text_section .section ".text.atom", "ax"
diff --git a/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h b/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h
index 692b0c5..722dcae 100644
--- a/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h
+++ b/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h
@@ -10,7 +10,7 @@
SHLIB_COMPAT(lib, introduced, LONG_DOUBLE_COMPAT_VERSION)
#define long_double_symbol(lib, local, symbol) \
long_double_symbol_1 (lib, local, symbol, LONG_DOUBLE_COMPAT_VERSION)
-#if defined HAVE_ELF && defined SHARED && defined DO_VERSIONING
+#if defined SHARED && defined DO_VERSIONING
# define ldbl_hidden_def(local, name) libc_hidden_ver (local, name)
# define ldbl_strong_alias(name, aliasname) \
strong_alias (name, __GL_##name##_##aliasname) \
diff --git a/sysdeps/mach/sysdep.h b/sysdeps/mach/sysdep.h
index 825198c..bb287a3 100644
--- a/sysdeps/mach/sysdep.h
+++ b/sysdeps/mach/sysdep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995, 1997, 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
@@ -28,7 +28,6 @@
#define EXT(x) C_SYMBOL_NAME(x)
#define LEXT(x) C_SYMBOL_NAME(x##:)
-#ifdef HAVE_ELF
/* For ELF we need to add the `.type' directive to make shared libraries
work right. */
#undef ENTRY
@@ -37,7 +36,6 @@
.align ALIGN; \
.type name,@function; \
name:
-#endif
#endif
diff --git a/sysdeps/powerpc/powerpc32/Makefile b/sysdeps/powerpc/powerpc32/Makefile
index ed24484..84a9841 100644
--- a/sysdeps/powerpc/powerpc32/Makefile
+++ b/sysdeps/powerpc/powerpc32/Makefile
@@ -23,7 +23,6 @@ pic-ccflag = -fpic
endif
ifeq ($(subdir),csu)
-ifneq ($(elf),no)
# The initfini generation code doesn't work in the presence of -fPIC, so
# we use -fpic instead which is much better.
CFLAGS-initfini.s += -fpic -O1
@@ -32,7 +31,7 @@ CFLAGS-initfini.s += -fpic -O1
# of the library should be able to control what goes into sdata.
CFLAGS-init.o = -G0
CFLAGS-gmon-start.o = -G0
-endif
+
ifeq (yes,$(build-shared))
# Compatibility
ifeq (yes,$(have-protected))
diff --git a/sysdeps/powerpc/powerpc64/Makefile b/sysdeps/powerpc/powerpc64/Makefile
index 9056e60..efaa296 100644
--- a/sysdeps/powerpc/powerpc64/Makefile
+++ b/sysdeps/powerpc/powerpc64/Makefile
@@ -28,12 +28,10 @@ no-special-regs := $(sort $(foreach n,40 41 50 51 60 61 62 63 \
ifeq ($(subdir),csu)
sysdep_routines += hp-timing
elide-routines.os += hp-timing
-ifneq ($(elf),no)
# The initfini generation code doesn't work in the presence of -fPIC, so
# we use -fpic instead which is much better.
CFLAGS-initfini.s += -fpic -O1
endif
-endif
ifeq ($(subdir),elf)
# help gcc inline asm code from dl-machine.h
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) \
diff --git a/sysdeps/sh/sysdep.h b/sysdeps/sh/sysdep.h
index 743631a..9f37dc9 100644
--- a/sysdeps/sh/sysdep.h
+++ b/sysdeps/sh/sysdep.h
@@ -1,5 +1,5 @@
/* Assembler macros for SH.
- Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2005, 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
@@ -23,8 +23,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;
@@ -36,15 +34,6 @@
#define PLTJMP(_x) _x
#endif
-#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
/* Define an entry point visible from C. */
#define ENTRY(name) \
diff --git a/sysdeps/unix/sparc/sysdep.h b/sysdeps/unix/sparc/sysdep.h
index 590b7ab..fbfb74c 100644
--- a/sysdeps/unix/sparc/sysdep.h
+++ b/sysdeps/unix/sparc/sysdep.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 1993, 1994, 1995, 1997, 2003, 2011
- Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1994, 1995, 1997, 2003, 2011, 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
@@ -49,20 +49,12 @@ __sparc_get_pc_thunk.reg: \
mov %##tmp, %o7;
#endif
-#ifdef HAVE_ELF
#define ENTRY(name) \
.global C_SYMBOL_NAME(name); \
.type name,@function; \
.align 4; \
C_LABEL(name)
-#else
-#define ENTRY(name) \
- .global C_SYMBOL_NAME(name); \
- .align 4; \
- C_LABEL(name)
-
-#endif /* HAVE_ELF */
#define PSEUDO(name, syscall_name, args) \
.global syscall_error; \
diff --git a/sysdeps/wordsize-32/divdi3.c b/sysdeps/wordsize-32/divdi3.c
index 8fa6343..69bdc77 100644
--- a/sysdeps/wordsize-32/divdi3.c
+++ b/sysdeps/wordsize-32/divdi3.c
@@ -1,5 +1,5 @@
/* 64-bit multiplication and division
- Copyright (C) 1989, 1992-1999,2000,2001,2002,2003,2004,2005
+ Copyright (C) 1989, 1992-1999,2000,2001,2002,2003,2004,2005,2012
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -335,7 +335,7 @@ strong_alias (__umoddi3, __umoddi3_internal)
/* We declare these with compat_symbol so that they are not visible at
link time. Programs must use the functions from libgcc. */
-#if defined HAVE_ELF && defined SHARED && defined DO_VERSIONING
+#if defined SHARED && defined DO_VERSIONING
# include <shlib-compat.h>
compat_symbol (libc, __divdi3, __divdi3, GLIBC_2_0);
compat_symbol (libc, __moddi3, __moddi3, GLIBC_2_0);
diff --git a/sysdeps/x86_64/sysdep.h b/sysdeps/x86_64/sysdep.h
index d61e126..cb8dced 100644
--- a/sysdeps/x86_64/sysdep.h
+++ b/sysdeps/x86_64/sysdep.h
@@ -1,5 +1,5 @@
/* Assembler macros for x86-64.
- Copyright (C) 2001, 2002, 2003, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2011, 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
@@ -23,8 +23,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. */
@@ -35,14 +33,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) \
@@ -106,12 +96,8 @@ lose: \
/* Local label name for asm code. */
#ifndef L
-# ifdef HAVE_ELF
/* ELF-like local names start with `.L'. */
-# define L(name) .L##name
-# else
-# define L(name) name
-# endif
+# define L(name) .L##name
#endif
#define atom_text_section .section ".text.atom", "ax"
generated by cgit v1.1 at 2024-11-07 02:56:41 +0000