Author: sebor
Date: Wed Oct 19 13:06:53 2005
New Revision: 326670
URL: http://svn.apache.org/viewcvs?rev=326670&view=rev
Log:
2005-10-19 Martin Sebor <[EMAIL PROTECTED]>
STDCXX-49
* gcc.config: Removed -fsquangle for gcc > 2 as the option is not
supported there.
Removed the -pthread option on IRIX since it's not recognized there.
STDCXX-50
* gcc.config: Added -Wl,-woff,84 to LDFLAGS on IRIX to silence
ld warnings about libraries not used to resolve any symbol.
Modified:
incubator/stdcxx/trunk/etc/config/gcc.config
Modified: incubator/stdcxx/trunk/etc/config/gcc.config
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/etc/config/gcc.config?rev=326670&r1=326669&r2=326670&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/gcc.config (original)
+++ incubator/stdcxx/trunk/etc/config/gcc.config Wed Oct 19 13:06:53 2005
@@ -70,9 +70,15 @@
endif
endif
-# prevent (some) assemler errors caused by overly long symbol names
ifeq ($(OSNAME),IRIX64)
-CXXFLAGS += -fsquangle
+ ifeq ($(CXX_MAJOR),2)
+ # prevent (some) assembler errors caused by overly long symbol names
+ # (the option is not supported in gcc 3 and beyond)
+ CXXFLAGS += -fsquangle
+ endif
+
+ # disable ld warnings about libs not used to resolve any symbols
+ LDFLAGS += -Wl,-woff,84
endif
# prevent (some) assemler errors caused by overly long symbol names
@@ -121,19 +127,24 @@
STATIC_CPPFLAGS =
STATIC_LDFLAGS =
-# Compiler and linker flags for multi-threading; use undocumented
-# [though long implemented] gcc option -pthread which defines _REENTRANT;
-# option is named -pthreads for gcc on Sun/Solaris
-MULTI_CPPFLAGS_POSIX = -pthread
-
+# compiler and linker flags for thread safety
+# use undocumented (though long implemented) gcc option -pthread
+# which defines _REENTRANT;
+# the same option is named -pthreads on Solaris
ifeq ($(findstring CYGWIN,$(OSNAME)),)
ifeq ($(OSNAME),SunOS)
MULTI_CPPFLAGS_POSIX = -pthreads
MULTI_LDFLAGS_POSIX = -pthreads
else
- MULTI_CPPFLAGS_POSIX = -pthread
- MULTI_LDFLAGS_POSIX = -pthread
+ ifeq ($(OSNAME),IRIX64)
+ # no -pthreads option (or similar) on IRIX?
+ MULTI_CPPFLAGS_POSIX = -D_REENTRANT
+ MULTI_LDFLAGS_POSIX = -lpthread
+ else
+ MULTI_CPPFLAGS_POSIX = -pthread
+ MULTI_LDFLAGS_POSIX = -pthread
+ endif
endif
else
# on Cygwin use MingW-threads by default
