aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nptl/ChangeLog3
-rw-r--r--nptl/sysdeps/unix/sysv/linux/s390/dl-sysdep.h37
-rw-r--r--sysdeps/generic/dl-sysdep.h7
3 files changed, 9 insertions, 38 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 98d312c..c1c695b 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,8 @@
2003-03-03 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/unix/sysv/linux/s390/dl-sysdep.h: Removed. The generic
+ version is just fine.
+
* sysdeps/unix/sysv/linux/libc_pthread_init.c
(__pthread_child_handler): Renamed from pthread_child_handler,
exported, and marked hidden. Change all users.
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/dl-sysdep.h b/nptl/sysdeps/unix/sysv/linux/s390/dl-sysdep.h
deleted file mode 100644
index 9a19d68..0000000
--- a/nptl/sysdeps/unix/sysv/linux/s390/dl-sysdep.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* System-specific settings for dynamic linker code. s390 version.
- Copyright (C) 2003 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#ifndef _DL_SYSDEP_H
-#define _DL_SYSDEP_H 1
-
-/* This macro must be defined to either 0 or 1.
-
- If 1, then an errno global variable hidden in ld.so will work right with
- all the errno-using libc code compiled for ld.so, and there is never a
- need to share the errno location with libc. This is appropriate only if
- all the libc functions that ld.so uses are called without PLT and always
- get the versions linked into ld.so rather than the libc ones. */
-
-#ifdef IS_IN_rtld
-# define RTLD_PRIVATE_ERRNO 1
-#else
-# define RTLD_PRIVATE_ERRNO 0
-#endif
-
-#endif /* dl-sysdep.h */
diff --git a/sysdeps/generic/dl-sysdep.h b/sysdeps/generic/dl-sysdep.h
index 98bd5db..5652870 100644
--- a/sysdeps/generic/dl-sysdep.h
+++ b/sysdeps/generic/dl-sysdep.h
@@ -1,5 +1,5 @@
/* System-specific settings for dynamic linker code. Generic version.
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003 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
@@ -17,6 +17,9 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#ifndef _DL_SYSDEP_H
+#define _DL_SYSDEP_H 1
+
/* This macro must be defined to either 0 or 1.
If 1, then an errno global variable hidden in ld.so will work right with
@@ -30,3 +33,5 @@
#else
# define RTLD_PRIVATE_ERRNO 0
#endif
+
+#endif /* dl-sysdep.h */