From 19089711ac2fd8c9e68e4e2d1868cd0a690eaaad Mon Sep 17 00:00:00 2001
From: "K. Noel Belcourt" <kbelco@sandia.gov>
Date: Tue, 25 Sep 2007 20:34:36 +0000
Subject: [PATCH] Add pgi.hpp configuration file for the Portland Group.

Fixed problems with threading, pic code, missing math
library, etc. to get mipspro toolset working better.

Updated pgi toolset to fix various problems with the
link line.



[SVN r39531]
---
 src/tools/mipspro.jam | 6 +++---
 src/tools/pgi.jam     | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/tools/mipspro.jam b/src/tools/mipspro.jam
index adc79f1c5..417eaefcf 100644
--- a/src/tools/mipspro.jam
+++ b/src/tools/mipspro.jam
@@ -67,11 +67,10 @@ flags mipspro.compile OPTIONS $(cpu-arch-64) : -64 ;
 flags mipspro.compile OPTIONS <debug-symbols>on : -g ; 
 # flags mipspro.compile OPTIONS <profiling>on : -xprofile=tcov ;
 flags mipspro.compile OPTIONS <warnings>off : -w ;
-flags mipspro.compile OPTIONS <warnings>on : -ansiW ;
+flags mipspro.compile OPTIONS <warnings>on : -ansiW -diag_suppress 1429 ; # suppress long long is nonstandard warning
 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 <cflags> : -LANG:std ;
 flags mipspro.compile.c++ OPTIONS <inlining>off : -INLINE:none ;
 flags mipspro.compile.c++ OPTIONS <cxxflags> ;
@@ -112,6 +111,7 @@ flags mipspro.link OPTIONS <linkflags> ;
 flags mipspro.link LINKPATH <library-path> ;
 flags mipspro.link FINDLIBS-ST <find-static-library> ;
 flags mipspro.link FINDLIBS-SA <find-shared-library> ;
+flags mipspro.link FINDLIBS-SA <threading>multi : pthread ;
 flags mipspro.link LIBRARIES <library-file> ;
 flags mipspro.link LINK-RUNTIME <runtime-link>static : static ;
 flags mipspro.link LINK-RUNTIME <runtime-link>shared : dynamic ;
@@ -124,7 +124,7 @@ rule link ( targets * : sources * : properties * )
 
 actions link bind LIBRARIES
 {
-    "$(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)
+    "$(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) -lm
 }
 
 # Slight mods for dlls
diff --git a/src/tools/pgi.jam b/src/tools/pgi.jam
index 01143f697..bfd996bb5 100644
--- a/src/tools/pgi.jam
+++ b/src/tools/pgi.jam
@@ -88,11 +88,12 @@ flags pgi.link OPTIONS <debug-symbols>on : -g ;
 # Strip the binary when no debugging is needed
 flags pgi.link OPTIONS <debug-symbols>off : -s ;
 flags pgi.link OPTIONS <profiling>on : -xprofile=tcov ;
-# flags pgi.link OPTIONS <threading>multi : -mt ;
 flags pgi.link OPTIONS <linkflags> ;
+flags pgi.link OPTIONS <link>shared : -fpic ;
 flags pgi.link LINKPATH <library-path> ;
 flags pgi.link FINDLIBS-ST <find-static-library> ;
 flags pgi.link FINDLIBS-SA <find-shared-library> ;
+flags pgi.link FINDLIBS-SA <threading>multi : pthread ;
 flags pgi.link LIBRARIES <library-file> ;
 flags pgi.link LINK-RUNTIME <runtime-link>static : static ;
 flags pgi.link LINK-RUNTIME <runtime-link>shared : dynamic ;
@@ -115,7 +116,7 @@ rule link ( targets * : sources * : properties * )
 # "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -Bdynamic -l$(FINDLIBS-SA) -Bstatic -l$(FINDLIBS-ST) -B$(LINK-RUNTIME)
 actions link bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -Bstatic -l$(FINDLIBS-ST)
+    "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -Bstatic -l$(FINDLIBS-ST) -Bdynamic -l$(FINDLIBS-SA) -B$(LINK-RUNTIME)
 }
 
 # Slight mods for dlls