[SMPI] Reverted removal of 'extern C' as this broke things.

[simgrid.git] / src / smpi / smpiff.in

diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index 9cfa9fb..6dceb77 100644 (file)
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -30,11 +30,15 @@ trap 'cleanup' EXIT
 filter_and_compile() {
     list_add TMPFILES "${TMPFILE}"
     #replace "program main_name by subroutine user\_main (and the end clause as well)"
-    sed 's/[[:space:]]\{6\}[[:space:]]*\(end \)\{0,1\}program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/      \1subroutine user_main /gI;s/[[:space:]]*use[[:space:]]*mpi/\include \"mpif\.h\" /gI' "${ARG}" > "${TMPFILE}"
-    ORIGFILE="${ARG}"
+    if [ $TRACE_CALL_LOCATION -gt 0 ]; then
+      echo "#include \"/tmp/local/include/smpi/smpi_extended_traces_fortran.h\"" > ${TMPFILE}
+    echo "#line 1 \"${ARG}\"" >> ${TMPFILE}
+    fi
+    sed 's/[[:space:]]\{6\}[[:space:]]*\(end \)\{0,1\}program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/      \1subroutine user_main /gI;s/[[:space:]]*use[[:space:]]*mpi/\include \"mpif\.h\" /gI' "${ARG}" >> "${TMPFILE}"
     SRCFILE="${TMPFILE}"
     list_add CMDLINE "${SRCFILE}"
 }
+TRACE_CALL_LOCATION=0
 NEEDS_OUTPUT=1
 
 list_set CMDLINE "${F77}"
@@ -50,10 +54,12 @@ while [ $# -gt 0 ]; do
             ;;
         *.f)
             TMPFILE=$(mymktemp "${ARG}" ".f")
+            ORIGFILE="${ARG%.f}"
             filter_and_compile
             ;;
         *.F)
             TMPFILE=$(mymktemp "${ARG}" ".F")
+            ORIGFILE="${ARG%.F}"
             filter_and_compile
             ;;
         '-version' | '--version')
@@ -67,6 +73,12 @@ while [ $# -gt 0 ]; do
         '-compiler-version' | '--compiler-version')
             ${F77} --version
             ;;
+        '-trace-call-location')
+            TRACE_CALL_LOCATION=1
+            # This should be list_add FFLAGS but it's not possible
+            # anymore: FFLAGS was already moved into CMDLINE above.
+            list_add_not_empty CMDLINE "-ffixed-line-length-none" "-cpp"
+            ;;
         -o)
             NEEDS_OUTPUT=0
             list_add CMDLINE "-o"   
@@ -78,7 +90,7 @@ while [ $# -gt 0 ]; do
 done
 
 if [ $NEEDS_OUTPUT -ne 0 ]; then
-   list_add CMDLINE "-o${ORIGFILE%.f}.o"     
+   list_add CMDLINE "-o${ORIGFILE}.o"     
 fi
 
 list_add_not_empty CMDLINE ${INCLUDEARGS}