diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-12-12 16:15:19 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2006-12-12 16:15:19 +0100 |
| commit | c2431a627221fbc00fbda42f493f0df219d5481a (patch) | |
| tree | 11f5c0ddc0f4e4365d94408adfa07a4c4273c152 | |
| parent | b5425e756b286c723d4b53129957f6e2aa1715f0 (diff) | |
| download | gcc-c2431a627221fbc00fbda42f493f0df219d5481a.zip gcc-c2431a627221fbc00fbda42f493f0df219d5481a.tar.gz gcc-c2431a627221fbc00fbda42f493f0df219d5481a.tar.bz2 | |
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
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/config/ia64/linux.h | 1 | ||||
| -rw-r--r-- | gcc/config/s390/linux.h | 1 | ||||
| -rw-r--r-- | gcc/gthr-posix.h | 2 |
4 files changed, 11 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a857f9a..3e5514b 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 9e8ca59..cecae0d 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 8efcaec..fd8ef0b 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 fb58be9..837bc1a 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 |