--- tools/build/v2/tools/vacpp.jam.orig	2009-11-24 06:48:06.000000000 -0500
+++ tools/build/v2/tools/vacpp.jam	2012-07-27 18:54:10.413628463 -0400
@@ -13,9 +13,30 @@
 import common ;
 import generators ;
 import os ;
+if [ os.name ] = LINUX
+{
+    import gcc ;
+}
 
 feature.extend toolset : vacpp ;
 toolset.inherit vacpp : unix ;
+if [ os.name ] = LINUX
+{
+    rule link ( targets * : sources * : properties * )
+    {
+        gcc.quote-rpath $(targets) ;
+    }
+
+    rule link.dll ( targets * : sources * : properties * )
+    {
+        gcc.quote-rpath $(targets) ;
+    }
+
+    rule archive ( targets * : sources * : properties * )
+    {
+        gcc.archive $(targets) : $(sources) : $(properties) ;
+    }
+}
 generators.override vacpp.prebuilt : builtin.prebuilt ;
 generators.override vacpp.searched-lib-generator : searched-lib-generator ;
 
@@ -25,10 +46,15 @@
     local condition = [ 
         common.check-init-parameters vacpp : version $(version) ] ;
               
-    command = [ common.get-invocation-command vacpp : xlC
+    local tool-command = [ common.get-invocation-command vacpp : xlC
         : $(command) : "/usr/vacpp/bin/xlC" ] ;
         
-    common.handle-options vacpp : $(condition) : $(command) : $(options) ;
+    common.handle-options vacpp : $(condition) : $(tool-command) : $(options) ;
+
+    if [ os.name ] = LINUX
+    {
+        gcc.init-link-flags vacpp gnu $(condition) ;
+    }
 }
 
 # Declare generators
@@ -43,11 +69,10 @@
 flags vacpp CFLAGS <optimization>speed : -O3 -qstrict ;
 flags vacpp CFLAGS <optimization>space : -O2 -qcompact ;
 
-# Discretionary inlining (not recommended)
+# Inlining
 flags vacpp CFLAGS <inlining>off : -qnoinline ;
-flags vacpp CFLAGS <inlining>on : -qinline ;
-#flags vacpp CFLAGS <inlining>full : -qinline ;
-flags vacpp CFLAGS <inlining>full : ;
+flags vacpp CFLAGS <inlining>on : -qinline=noauto ;
+flags vacpp CFLAGS <inlining>full : -qinline=auto ;
 
 # Exception handling
 flags vacpp C++FLAGS <exception-handling>off : -qnoeh ;
@@ -59,18 +84,21 @@
 
 # Enable 64-bit memory addressing model
 flags vacpp CFLAGS <address-model>64 : -q64 ;
-flags vacpp LINKFLAGS <address-model>64 : -q64 ;
-flags vacpp ARFLAGS <target-os>aix/<address-model>64 : -X 64 ;
+flags vacpp.link OPTIONS <address-model>64 : -q64 ;
+flags vacpp AIX_OBJ_MODE <target-os>aix/<address-model>64 : -X 64 ;
 
 # Use absolute path when generating debug information
 flags vacpp CFLAGS <debug-symbols>on : -g -qfullpath ;
-flags vacpp LINKFLAGS <debug-symbols>on : -g -qfullpath ;
-flags vacpp LINKFLAGS <debug-symbols>off : -s ;
+flags vacpp.link OPTIONS <debug-symbols>on : -g -qfullpath ;
+flags vacpp.link OPTIONS <target-os>aix/<debug-symbols>off/<strip>on : -s ;
 
 if [ os.name ] = AIX
 {
     flags vacpp.compile C++FLAGS : -qfuncsect ;
 
+    # Enable 32-bit Very Large Address-Space
+    flags vacpp.link OPTIONS <address-model>32 : -bmaxdata:0xAFFFFFFF/dsa ;
+
     # The -bnoipath strips the prepending (relative) path of libraries from
     # the loader section in the target library or executable. Hence, during
     # load-time LIBPATH (identical to LD_LIBRARY_PATH) or a hard-coded
@@ -84,7 +112,7 @@
     # AIX 4.x and AIX 6.x. For details about the AIX linker see:
     # http://download.boulder.ibm.com/ibmdl/pub/software/dw/aix/es-aix_ll.pdf
     #
-    flags vacpp.link LINKFLAGS <link>shared : -bnoipath ;
+    flags vacpp.link OPTIONS <link>shared : -bnoipath ;
 
     # Run-time linking
     flags vacpp.link EXE-LINKFLAGS <link>shared : -brtl ;
@@ -93,12 +121,13 @@
 {
     # Linux PPC
     flags vacpp.compile CFLAGS <link>shared : -qpic=large ;
-    flags vacpp FINDLIBS : rt ;
+    flags vacpp.link OPTIONS <link>shared : -qpic=large ;
+    flags vacpp.link FINDLIBS-SA <threading>multi : rt ;
 }
 
 # Profiling
 flags vacpp CFLAGS <profiling>on : -pg ;
-flags vacpp LINKFLAGS <profiling>on : -pg ;
+flags vacpp.link OPTIONS <profiling>on : -pg ;
 
 flags vacpp.compile OPTIONS <cflags> ;
 flags vacpp.compile.c++ OPTIONS <cxxflags> ;
@@ -106,45 +135,71 @@
 flags vacpp UNDEFS <undef> ;
 flags vacpp HDRS <include> ;
 flags vacpp STDHDRS <sysinclude> ;
-flags vacpp.link OPTIONS <linkflags> ;
+
 flags vacpp ARFLAGS <arflags> ;
+flags vacpp ARFLAGS <archiveflags> ;
 
-flags vacpp LIBPATH <library-path> ;
-flags vacpp NEEDLIBS <library-file> ;
-flags vacpp FINDLIBS <find-shared-library> ;
-flags vacpp FINDLIBS <find-static-library> ;
-
-# Select the compiler name according to the threading model.
-flags vacpp VA_C_COMPILER  <threading>single : xlc   ;
-flags vacpp VA_C_COMPILER  <threading>multi : xlc_r ;
-flags vacpp VA_CXX_COMPILER <threading>single : xlC   ;
-flags vacpp VA_CXX_COMPILER <threading>multi : xlC_r ;
+flags vacpp.link USER_OPTIONS <linkflags> ;
+flags vacpp.link LINKPATH <library-path> ;
+flags vacpp.link LIBRARIES <library-file> ;
+flags vacpp.link FINDLIBS-ST <find-static-library> ;
+flags vacpp.link FINDLIBS-SA <find-shared-library> ;
+
+# Select the compiler configuration stanza according to the threading model.
+flags vacpp VA_C_COMPILER_CFG  <threading>single : -F:xlc ;
+flags vacpp VA_C_COMPILER_CFG  <threading>multi : -F:xlc_r ;
+flags vacpp VA_CXX_COMPILER_CFG <threading>single : -F:xlC ;
+flags vacpp VA_CXX_COMPILER_CFG <threading>multi : -F:xlC_r ;
 
 SPACE = " " ;
 
-flags vacpp.link.dll HAVE_SONAME <target-os>linux : "" ;
-
-actions vacpp.link bind NEEDLIBS
+if [ os.name ] = AIX
 {
-    $(VA_CXX_COMPILER) $(EXE-LINKFLAGS) $(LINKFLAGS) -o "$(<[1])" -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS) $(OPTIONS) $(USER_OPTIONS)
+    actions vacpp.link bind LIBRARIES
+    {
+        $(CONFIG_COMMAND) $(VA_CXX_COMPILER_CFG) $(EXE-LINKFLAGS) -o "$(<[1])" -L$(LINKPATH) "$(>)" "$(LIBRARIES)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) $(OPTIONS) $(USER_OPTIONS)
+    }
+
+    actions vacpp.link.dll bind LIBRARIES
+    {
+        $(CONFIG_COMMAND) $(VA_CXX_COMPILER_CFG) -G -o "$(<[1])" $(HAVE_SONAME)-Wl,-soname$(SPACE)-Wl,$(<[-1]:D=) -L$(LINKPATH) "$(>)" "$(LIBRARIES)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) $(OPTIONS) $(USER_OPTIONS) 
+    }
 }
-
-actions vacpp.link.dll bind NEEDLIBS
+else
 {
-    xlC_r -G $(LINKFLAGS) -o "$(<[1])" $(HAVE_SONAME)-Wl,-soname$(SPACE)-Wl,$(<[-1]:D=) -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS) $(OPTIONS) $(USER_OPTIONS) 
+    actions link bind LIBRARIES
+    {
+        $(CONFIG_COMMAND) $(VA_CXX_COMPILER_CFG) -L"$(LINKPATH)" -Wl,-R,$(RPATH) -Wl,-rpath-link,"$(RPATH_LINK)" -o "$(<[1])" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
+    }
+    actions link.dll bind LIBRARIES
+    {
+        $(CONFIG_COMMAND) $(VA_CXX_COMPILER_CFG) -G -L"$(LINKPATH)" -Wl,-R,$(RPATH) -o "$(<[1])" -Wl,-h,$(<[-1]:D=) $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
+    }
 }
 
 actions vacpp.compile.c
 {
-    $(VA_C_COMPILER) -c $(OPTIONS) $(USER_OPTIONS) -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
+    $(CONFIG_COMMAND) $(VA_C_COMPILER_CFG) -c $(OPTIONS) $(USER_OPTIONS) -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
 }
 
 actions vacpp.compile.c++
 {
-    $(VA_CXX_COMPILER) -c $(OPTIONS) $(USER_OPTIONS) -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
+    $(CONFIG_COMMAND) $(VA_CXX_COMPILER_CFG) -c $(OPTIONS) $(USER_OPTIONS) -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
 }
 
-actions updated together piecemeal vacpp.archive
+if [ os.name ] = AIX
+{
+    actions updated together piecemeal vacpp.archive
+    {
+        ar $(AIX_OBJ_MODE) $(ARFLAGS) rcu "$(<)" "$(>)"
+        ranlib $(AIX_OBJ_MODE) "$(<)"
+    }
+}
+else
 {
-    ar $(ARFLAGS) ru "$(<)" "$(>)"
+    actions piecemeal archive
+    {
+        ar $(ARFLAGS) rc "$(<)" "$(>)"
+        ranlib "$(<)"
+    }
 }