diff options
| author | Kaveh R. Ghazi <ghazi@caip.rutgers.edu> | 2002-05-13 02:52:47 +0000 |
|---|---|---|
| committer | Kaveh Ghazi <ghazi@gcc.gnu.org> | 2002-05-13 02:52:47 +0000 |
| commit | 31397a7b647de5fd81965c36a86ac04b1de7da57 (patch) | |
| tree | 6c03ea1e0df0a833f0a7a9d1c789e710557a7bab | |
| parent | e2f751475364ac2ccfa59a8259ce97a177e65055 (diff) | |
| download | gcc-31397a7b647de5fd81965c36a86ac04b1de7da57.zip gcc-31397a7b647de5fd81965c36a86ac04b1de7da57.tar.gz gcc-31397a7b647de5fd81965c36a86ac04b1de7da57.tar.bz2 | |
os_defines.h: Revert 2002-05-06 change.
libstdc++-v3:
* config/os/irix/irix5.2/bits/os_defines.h: Revert 2002-05-06
change.
gcc:
* mips/iris6.h (CPLUSPLUS_CPP_SPEC): Define.
From-SVN: r53408
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/config/mips/iris6.h | 12 | ||||
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/config/os/irix/irix5.2/bits/os_defines.h | 19 |
4 files changed, 23 insertions, 17 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 755323e..a6fffce 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2002-05-12 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * mips/iris6.h (CPLUSPLUS_CPP_SPEC): Define. + 2002-05-12 Tom Tromey <tromey@redhat.com> * tree.h (copy_node): Don't mention TREE_PERMANENT. diff --git a/gcc/config/mips/iris6.h b/gcc/config/mips/iris6.h index 776434a..56ea807 100644 --- a/gcc/config/mips/iris6.h +++ b/gcc/config/mips/iris6.h @@ -124,6 +124,18 @@ Boston, MA 02111-1307, USA. */ %{mabi=64: -D__mips64} \ %{!mabi*: -D__mips64}" +/* The GNU C++ standard library requires that __EXTENSIONS__ and + _SGI_SOURCE be defined on at least irix6.2 and probably all irix6 + prior to 6.5. They normally get defined in SUBTARGET_CPP_SPEC if + !ansi, for g++ we want them regardless. We don't need this on + irix6.5 itself, but it shouldn't hurt other than the namespace + polution. */ +#undef CPLUSPLUS_CPP_SPEC +#define CPLUSPLUS_CPP_SPEC "\ +-D__LANGUAGE_C_PLUS_PLUS -D_LANGUAGE_C_PLUS_PLUS \ +%{ansi:-D__EXTENSIONS__ -D_SGI_SOURCE} %(cpp) \ +" + /* Irix 6 uses DWARF-2. */ #define DWARF2_DEBUGGING_INFO #define MIPS_DEBUGGING_INFO diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 368b613..6f09d63 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2002-05-12 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * config/os/irix/irix5.2/bits/os_defines.h: Revert 2002-05-06 + change. + 2002-05-11 John David Anglin <dave@hiauly1.hia.nrc.ca> * config/os/gnu-linux/bits/os_defines.h (__glibcpp_long_bits): Define diff --git a/libstdc++-v3/config/os/irix/irix5.2/bits/os_defines.h b/libstdc++-v3/config/os/irix/irix5.2/bits/os_defines.h index be2d2fb..32055ec 100644 --- a/libstdc++-v3/config/os/irix/irix5.2/bits/os_defines.h +++ b/libstdc++-v3/config/os/irix/irix5.2/bits/os_defines.h @@ -44,27 +44,11 @@ // the command-line. #undef _POSIX_SOURCE -/* On at least irix6.2 (which uses this file,) the header files are - very fragile and depend heavily on _SGI_SOURCE and __EXTENSIONS__ - being defined. If they're not, then features disappear that - configure was relying on which then breaks the libstdc++ headers. - These macros are normally implicitly defined by the command-line, - however they are not defined when -ansi is used, and -ansi is - passed to the testsuite. The g++ test results (where it uses - libstdc++ headers) get dozens of extra failures without these - macros, so ensure they always are defined here. */ -#ifndef _SGI_SOURCE -# define _SGI_SOURCE -#endif -#ifndef __EXTENSIONS__ -# define __EXTENSIONS__ -#endif - #define __off_t off_t #define __off64_t off64_t #define __ssize_t ssize_t -// GCC does not use thunks on IRIX. +// GCC does not use thunks on IRIX. #define _G_USING_THUNKS 0 #define __glibcpp_long_double_bits 64 @@ -74,3 +58,4 @@ #endif #endif + |