[Boost-commit] svn:boost r39382 - in trunk: boost/config/compiler tools/build/v2/tools

From: kbelco_at_[hidden]
Date: 2007-09-18 22:59:00

Author: noel_belcourt
Date: 2007-09-18 22:59:00 EDT (Tue, 18 Sep 2007)
New Revision: 39382
URL: http://svn.boost.org/trac/boost/changeset/39382

Log:
Update the mipspro.jam file so have the compiler
emit each referenced template in the object file
where referenced and then rely on the linker to
remove duplicates.

Added some missing macros to sgi_mipspro.hpp.

Text files modified: 
   trunk/boost/config/compiler/sgi_mipspro.hpp |     4 ++++                                    
   trunk/tools/build/v2/tools/mipspro.jam      |     9 ++++++---                               
   2 files changed, 10 insertions(+), 3 deletions(-)

Modified: trunk/boost/config/compiler/sgi_mipspro.hpp
==============================================================================
--- trunk/boost/config/compiler/sgi_mipspro.hpp	(original)
+++ trunk/boost/config/compiler/sgi_mipspro.hpp	2007-09-18 22:59:00 EDT (Tue, 18 Sep 2007)
@@ -17,6 +17,10 @@
 // if no threading API is detected.
 //
 #define BOOST_HAS_THREADS
+#define BOOST_NO_TWO_PHASE_NAME_LOOKUP
+
+#undef BOOST_NO_SWPRINTF
+#undef BOOST_DEDUCED_TYPENAME
 //
 // version check:
 // probably nothing to do here?

Modified: trunk/tools/build/v2/tools/mipspro.jam
==============================================================================
--- trunk/tools/build/v2/tools/mipspro.jam	(original)
+++ trunk/tools/build/v2/tools/mipspro.jam	2007-09-18 22:59:00 EDT (Tue, 18 Sep 2007)
@@ -71,13 +71,14 @@
 flags mipspro.compile OPTIONS <warnings>all : -fullwarn ;
 flags mipspro.compile OPTIONS <optimization>speed : -Ofast ;
 flags mipspro.compile OPTIONS <optimization>space : -O2 ;
-flags mipspro.compile OPTIONS <threading>multi : -mt ;
+# flags mipspro.compile OPTIONS <threading>multi : -mt ;
 flags mipspro.compile OPTIONS <cflags> : -LANG:std ;
 flags mipspro.compile.c++ OPTIONS <inlining>off : -INLINE:none ;
 flags mipspro.compile.c++ OPTIONS <cxxflags> ;
 flags mipspro.compile DEFINES <define> ;
 flags mipspro.compile INCLUDES <include> ;
 
+
 flags mipspro.compile.fortran OPTIONS <fflags> ;
 
 actions compile.c
@@ -87,7 +88,7 @@
 
 actions compile.c++
 {
-    "$(CONFIG_COMMAND)" $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
+    "$(CONFIG_COMMAND)" -FE:template_in_elf_section -ptused $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
 }
 
 actions compile.fortran
@@ -105,6 +106,8 @@
 flags mipspro.link OPTIONS $(cpu-arch-32) : -n32 ;
 flags mipspro.link OPTIONS $(cpu-arch-64) : -64 ;
 
+flags mipspro.link OPTIONS <optimization>speed : -Ofast ;
+flags mipspro.link OPTIONS <optimization>space : -O2 ;
 flags mipspro.link OPTIONS <linkflags> ;
 flags mipspro.link LINKPATH <library-path> ;
 flags mipspro.link FINDLIBS-ST <find-static-library> ;
@@ -121,7 +124,7 @@
 
 actions link bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -Bdynamic -l$(FINDLIBS-SA) -Bstatic -l$(FINDLIBS-ST) -B$(LINK-RUNTIME)
+    "$(CONFIG_COMMAND)" -FE:template_in_elf_section -ptused $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -Bdynamic -l$(FINDLIBS-SA) -Bstatic -l$(FINDLIBS-ST) -B$(LINK-RUNTIME)
 }
 
 # Slight mods for dlls