summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2006-12-12 16:21:53 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2006-12-12 16:21:53 +0100
commit779019894c872e6e3a1eb71f9f38b370adbd2c9b (patch)
tree0e2e4e198bd4dc896cc6a9f3dd48ca37862a9edf /gcc
parenta1b885af6887dae6ebd77f057110a4db4a36bc00 (diff)
downloadgcc-779019894c872e6e3a1eb71f9f38b370adbd2c9b.tar.gz
re PR libstdc++/11953 (_REENTRANT defined when compiling non-threaded code.)
PR libstdc++/11953 * gthr-posix.h (_REENTRANT): Only define if __osf__ is defined. * config/ia64/linux.h (CPP_SPEC): Define. * config/s390/linux.h (CPP_SPEC): Define. From-SVN: r119789
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/config/ia64/linux.h1
-rw-r--r--gcc/config/s390/linux.h1
-rw-r--r--gcc/gthr-posix.h2
4 files changed, 11 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5c07a9d1cc3..d96987d2c81 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-12 Jakub Jelinek <jakub@redhat.com>
+
+ PR libstdc++/11953
+ * gthr-posix.h (_REENTRANT): Only define if __osf__ is defined.
+
+ * config/ia64/linux.h (CPP_SPEC): Define.
+ * config/s390/linux.h (CPP_SPEC): Define.
+
2006-12-12 Jim Wilson <wilson@specifix.com>
Jakub Jelinek <jakub@redhat.com>
diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
index 9e8ca596e75..cecae0dfe32 100644
--- a/gcc/config/ia64/linux.h
+++ b/gcc/config/ia64/linux.h
@@ -48,6 +48,7 @@ do { \
%{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}} \
%{static:-static}}"
+#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
#define JMP_BUF_SIZE 76
diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
index 8efcaec339f..fd8ef0b9a47 100644
--- a/gcc/config/s390/linux.h
+++ b/gcc/config/s390/linux.h
@@ -88,6 +88,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
%{m31:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "} \
%{m64:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}}}"
+#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
diff --git a/gcc/gthr-posix.h b/gcc/gthr-posix.h
index fb58be94ea6..837bc1a9820 100644
--- a/gcc/gthr-posix.h
+++ b/gcc/gthr-posix.h
@@ -36,7 +36,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
#define __GTHREADS 1
/* Some implementations of <pthread.h> require this to be defined. */
-#ifndef _REENTRANT
+#if !defined(_REENTRANT) && defined(__osf__)
#define _REENTRANT 1
#endif