From 4089566a4743e5dadd69b554c7fd6ea4d0e3fa92 Mon Sep 17 00:00:00 2001 From: carns Date: Thu, 29 Oct 2009 14:10:18 +0000 Subject: [PATCH] updated symbol check logic to work in -shared case as well git-svn-id: https://svn.mcs.anl.gov/repos/darshan/trunk@89 3b7491f3-a168-0410-bf4b-c445ed680a29 --- compilers/mpicc-trace-bgp-V1R4.in | 4 +++- compilers/mpicc-trace-pcarns.in | 4 +++- compilers/mpicxx-trace-bgp-V1R4.in | 4 +++- compilers/mpicxx-trace-pcarns.in | 4 +++- compilers/mpif77-trace-bgp-V1R4.in | 4 +++- compilers/mpif77-trace-pcarns.in | 4 +++- compilers/mpif90-trace-bgp-V1R4.in | 4 +++- compilers/mpixlc-trace-bgp-V1R4.in | 4 +++- compilers/mpixlc_r-trace-bgp-V1R4.in | 4 +++- compilers/mpixlcxx-trace-bgp-V1R4.in | 4 +++- compilers/mpixlcxx_r-trace-bgp-V1R4.in | 4 +++- compilers/mpixlf2003-trace-bgp-V1R4.in | 4 +++- compilers/mpixlf2003_r-trace-bgp-V1R4.in | 4 +++- compilers/mpixlf77-trace-bgp-V1R4.in | 4 +++- compilers/mpixlf77_r-trace-bgp-V1R4.in | 4 +++- compilers/mpixlf90-trace-bgp-V1R4.in | 4 +++- compilers/mpixlf90_r-trace-bgp-V1R4.in | 4 +++- compilers/mpixlf95-trace-bgp-V1R4.in | 4 +++- compilers/mpixlf95_r-trace-bgp-V1R4.in | 4 +++- 19 files changed, 57 insertions(+), 19 deletions(-) diff --git a/compilers/mpicc-trace-bgp-V1R4.in b/compilers/mpicc-trace-bgp-V1R4.in index 9c27808..20f4892 100755 --- a/compilers/mpicc-trace-bgp-V1R4.in +++ b/compilers/mpicc-trace-bgp-V1R4.in @@ -269,7 +269,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? diff --git a/compilers/mpicc-trace-pcarns.in b/compilers/mpicc-trace-pcarns.in index 6ae5ec7..70766a9 100755 --- a/compilers/mpicc-trace-pcarns.in +++ b/compilers/mpicc-trace-pcarns.in @@ -252,7 +252,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? diff --git a/compilers/mpicxx-trace-bgp-V1R4.in b/compilers/mpicxx-trace-bgp-V1R4.in index 325c705..aab2a03 100755 --- a/compilers/mpicxx-trace-bgp-V1R4.in +++ b/compilers/mpicxx-trace-bgp-V1R4.in @@ -269,7 +269,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? diff --git a/compilers/mpicxx-trace-pcarns.in b/compilers/mpicxx-trace-pcarns.in index b6d809d..7b834dd 100755 --- a/compilers/mpicxx-trace-pcarns.in +++ b/compilers/mpicxx-trace-pcarns.in @@ -252,7 +252,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? diff --git a/compilers/mpif77-trace-bgp-V1R4.in b/compilers/mpif77-trace-bgp-V1R4.in index da1be4a..a97a141 100755 --- a/compilers/mpif77-trace-bgp-V1R4.in +++ b/compilers/mpif77-trace-bgp-V1R4.in @@ -317,7 +317,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? diff --git a/compilers/mpif77-trace-pcarns.in b/compilers/mpif77-trace-pcarns.in index c76fd9a..a994f54 100755 --- a/compilers/mpif77-trace-pcarns.in +++ b/compilers/mpif77-trace-pcarns.in @@ -298,7 +298,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? diff --git a/compilers/mpif90-trace-bgp-V1R4.in b/compilers/mpif90-trace-bgp-V1R4.in index 884158a..c888579 100755 --- a/compilers/mpif90-trace-bgp-V1R4.in +++ b/compilers/mpif90-trace-bgp-V1R4.in @@ -364,7 +364,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? diff --git a/compilers/mpixlc-trace-bgp-V1R4.in b/compilers/mpixlc-trace-bgp-V1R4.in index 0094712..5fec6c2 100755 --- a/compilers/mpixlc-trace-bgp-V1R4.in +++ b/compilers/mpixlc-trace-bgp-V1R4.in @@ -269,7 +269,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? diff --git a/compilers/mpixlc_r-trace-bgp-V1R4.in b/compilers/mpixlc_r-trace-bgp-V1R4.in index a9f529b..4d1dd38 100755 --- a/compilers/mpixlc_r-trace-bgp-V1R4.in +++ b/compilers/mpixlc_r-trace-bgp-V1R4.in @@ -269,7 +269,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? diff --git a/compilers/mpixlcxx-trace-bgp-V1R4.in b/compilers/mpixlcxx-trace-bgp-V1R4.in index d145377..4d7d14c 100755 --- a/compilers/mpixlcxx-trace-bgp-V1R4.in +++ b/compilers/mpixlcxx-trace-bgp-V1R4.in @@ -269,7 +269,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? diff --git a/compilers/mpixlcxx_r-trace-bgp-V1R4.in b/compilers/mpixlcxx_r-trace-bgp-V1R4.in index 518d09f..460cb48 100755 --- a/compilers/mpixlcxx_r-trace-bgp-V1R4.in +++ b/compilers/mpixlcxx_r-trace-bgp-V1R4.in @@ -269,7 +269,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? diff --git a/compilers/mpixlf2003-trace-bgp-V1R4.in b/compilers/mpixlf2003-trace-bgp-V1R4.in index f287eb6..41e7a10 100755 --- a/compilers/mpixlf2003-trace-bgp-V1R4.in +++ b/compilers/mpixlf2003-trace-bgp-V1R4.in @@ -317,7 +317,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? diff --git a/compilers/mpixlf2003_r-trace-bgp-V1R4.in b/compilers/mpixlf2003_r-trace-bgp-V1R4.in index 51d5c01..dadd32c 100755 --- a/compilers/mpixlf2003_r-trace-bgp-V1R4.in +++ b/compilers/mpixlf2003_r-trace-bgp-V1R4.in @@ -317,7 +317,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? diff --git a/compilers/mpixlf77-trace-bgp-V1R4.in b/compilers/mpixlf77-trace-bgp-V1R4.in index 8464630..85978a7 100755 --- a/compilers/mpixlf77-trace-bgp-V1R4.in +++ b/compilers/mpixlf77-trace-bgp-V1R4.in @@ -317,7 +317,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? diff --git a/compilers/mpixlf77_r-trace-bgp-V1R4.in b/compilers/mpixlf77_r-trace-bgp-V1R4.in index 2a78b4c..bdc0480 100755 --- a/compilers/mpixlf77_r-trace-bgp-V1R4.in +++ b/compilers/mpixlf77_r-trace-bgp-V1R4.in @@ -317,7 +317,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? diff --git a/compilers/mpixlf90-trace-bgp-V1R4.in b/compilers/mpixlf90-trace-bgp-V1R4.in index 0dae23b..981f2a8 100755 --- a/compilers/mpixlf90-trace-bgp-V1R4.in +++ b/compilers/mpixlf90-trace-bgp-V1R4.in @@ -317,7 +317,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? diff --git a/compilers/mpixlf90_r-trace-bgp-V1R4.in b/compilers/mpixlf90_r-trace-bgp-V1R4.in index 4a82ce1..4d41a1b 100755 --- a/compilers/mpixlf90_r-trace-bgp-V1R4.in +++ b/compilers/mpixlf90_r-trace-bgp-V1R4.in @@ -317,7 +317,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? diff --git a/compilers/mpixlf95-trace-bgp-V1R4.in b/compilers/mpixlf95-trace-bgp-V1R4.in index a447489..3069dfc 100755 --- a/compilers/mpixlf95-trace-bgp-V1R4.in +++ b/compilers/mpixlf95-trace-bgp-V1R4.in @@ -317,7 +317,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? diff --git a/compilers/mpixlf95_r-trace-bgp-V1R4.in b/compilers/mpixlf95_r-trace-bgp-V1R4.in index 329106d..32cc474 100755 --- a/compilers/mpixlf95_r-trace-bgp-V1R4.in +++ b/compilers/mpixlf95_r-trace-bgp-V1R4.in @@ -317,7 +317,9 @@ if [ "$linking" = yes ] ; then # create a temporary file tmpfile=`mktemp` # generate a map of the symbol names - $stock_link_cmd -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null + # don't use -shared for this step + stock_link_cmd_no_shared=`echo $stock_link_cmd | sed 's/ -shared / /g'` + $stock_link_cmd_no_shared -Wl,-Map,$tmpfile $LDFLAGS -o /dev/null >& /dev/null # is MPI in there? grep MPI $tmpfile >& /dev/null rc_mpi=$? -- 2.26.2