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: r119788

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a857f9a0483502ff4af0f5784ff6cb50388108fb..3e5514b356f2946287d7d1bd0a365b9c41aae215 100644 (file)
--- 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 9e8ca596e754bb994d0f10019d40f06ab2b1977f..cecae0dfe321f52b435e24302cb6ff31d03b2ea5 100644 (file)
--- 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 8efcaec339f6230ee59426af083602a945e1df01..fd8ef0b9a47a3d969ad6ed8228cdd3b1f78f1968 100644 (file)
--- 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 fb58be94ea6ab15425f5a643a50e7c4084028411..837bc1a9820ea01d6cc505bb432e6f04f6af5c4e 100644 (file)
--- 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