|
|
2a898e |
Index: openmpi-3.1.2/orte/test/system/Makefile
|
|
|
2a898e |
===================================================================
|
|
|
2a898e |
--- openmpi-3.1.2.orig/orte/test/system/Makefile
|
|
|
2a898e |
+++ openmpi-3.1.2/orte/test/system/Makefile
|
|
|
2a898e |
@@ -21,4 +21,4 @@ pmixtool:
|
|
|
2a898e |
ortecc -o pmixtool pmixtool.c -lpmix
|
|
|
2a898e |
|
|
|
2a898e |
threads:
|
|
|
2a898e |
- ortecc -O0 -g -lpthread -lhwloc threads.c -o threads
|
|
|
2a898e |
+ ortecc -O2 -g -lpthread -lhwloc threads.c -o threads
|
|
|
2a898e |
Index: openmpi-3.1.2/orte/tools/orte-dvm/Makefile.in
|
|
|
2a898e |
===================================================================
|
|
|
2a898e |
--- openmpi-3.1.2.orig/orte/tools/orte-dvm/Makefile.in
|
|
|
2a898e |
+++ openmpi-3.1.2/orte/tools/orte-dvm/Makefile.in
|
|
|
2a898e |
@@ -558,7 +558,7 @@ CCAS = @CCAS@
|
|
|
2a898e |
CCASDEPMODE = @CCASDEPMODE@
|
|
|
2a898e |
CCASFLAGS = @CCASFLAGS@
|
|
|
2a898e |
CCDEPMODE = @CCDEPMODE@
|
|
|
2a898e |
-CFLAGS = $(CFLAGS_WITHOUT_OPTFLAGS) $(DEBUGGER_CFLAGS)
|
|
|
2a898e |
+CFLAGS = @CFLAGS@
|
|
|
2a898e |
CFLAGS_WITHOUT_OPTFLAGS = @CFLAGS_WITHOUT_OPTFLAGS@
|
|
|
2a898e |
CLEANFILES = @CLEANFILES@
|
|
|
2a898e |
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
|
|
|
2a898e |
Index: openmpi-3.1.2/orte/tools/prun/Makefile.in
|
|
|
2a898e |
===================================================================
|
|
|
2a898e |
--- openmpi-3.1.2.orig/orte/tools/prun/Makefile.in
|
|
|
2a898e |
+++ openmpi-3.1.2/orte/tools/prun/Makefile.in
|
|
|
2a898e |
@@ -558,7 +558,7 @@ CCAS = @CCAS@
|
|
|
2a898e |
CCASDEPMODE = @CCASDEPMODE@
|
|
|
2a898e |
CCASFLAGS = @CCASFLAGS@
|
|
|
2a898e |
CCDEPMODE = @CCDEPMODE@
|
|
|
2a898e |
-CFLAGS = $(CFLAGS_WITHOUT_OPTFLAGS) $(DEBUGGER_CFLAGS)
|
|
|
2a898e |
+CFLAGS = @CFLAGS@
|
|
|
2a898e |
CFLAGS_WITHOUT_OPTFLAGS = @CFLAGS_WITHOUT_OPTFLAGS@
|
|
|
2a898e |
CLEANFILES = @CLEANFILES@
|
|
|
2a898e |
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
|
|
|
2a898e |
Index: openmpi-3.1.2/orte/Makefile.in
|
|
|
2a898e |
===================================================================
|
|
|
2a898e |
--- openmpi-3.1.2.orig/orte/Makefile.in
|
|
|
2a898e |
+++ openmpi-3.1.2/orte/Makefile.in
|
|
|
2a898e |
@@ -2162,7 +2162,7 @@ AM_LFLAGS = -Porte_util_hostfile_
|
|
|
2a898e |
liborted_mpir_la_SOURCES = \
|
|
|
2a898e |
orted/orted_submit.c
|
|
|
2a898e |
|
|
|
2a898e |
-liborted_mpir_la_CFLAGS = $(CFLAGS_WITHOUT_OPTFLAGS) $(DEBUGGER_CFLAGS)
|
|
|
2a898e |
+liborted_mpir_la_CFLAGS = $(CFLAGS)
|
|
|
2a898e |
all: all-recursive
|
|
|
2a898e |
|
|
|
2a898e |
.SUFFIXES:
|
|
|
2a898e |
Index: openmpi-3.1.2/ompi/debuggers/Makefile.in
|
|
|
2a898e |
===================================================================
|
|
|
2a898e |
--- openmpi-3.1.2.orig/ompi/debuggers/Makefile.in
|
|
|
2a898e |
+++ openmpi-3.1.2/ompi/debuggers/Makefile.in
|
|
|
2a898e |
@@ -756,7 +756,7 @@ CCDEPMODE = @CCDEPMODE@
|
|
|
2a898e |
# may already have debugging and/or optimization flags). We use
|
|
|
2a898e |
# post-processed forms of the CFLAGS in the library targets down
|
|
|
2a898e |
# below.
|
|
|
2a898e |
-CFLAGS = $(CFLAGS_WITHOUT_OPTFLAGS) $(DEBUGGER_CFLAGS)
|
|
|
2a898e |
+CFLAGS = @CFLAGS@
|
|
|
2a898e |
CFLAGS_WITHOUT_OPTFLAGS = @CFLAGS_WITHOUT_OPTFLAGS@
|
|
|
2a898e |
CLEANFILES = @CLEANFILES@
|
|
|
2a898e |
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
|
|
|
2a898e |
@@ -1984,7 +1984,7 @@ common = ompi_common_dll_defs.h ompi_com
|
|
|
2a898e |
|
|
|
2a898e |
# MPI message queue DLL
|
|
|
2a898e |
libompi_dbg_msgq_la_SOURCES = ompi_msgq_dll.c ompi_msgq_dll_defs.h $(common)
|
|
|
2a898e |
-libompi_dbg_msgq_la_CFLAGS = -g
|
|
|
2a898e |
+libompi_dbg_msgq_la_CFLAGS = -O2 -g
|
|
|
2a898e |
libompi_dbg_msgq_la_LDFLAGS = -module -avoid-version
|
|
|
2a898e |
|
|
|
2a898e |
# These are checks for the padding on predefined MPI object types.
|
|
|
2a898e |
Index: openmpi-3.1.2/ompi/mpi/fortran/use-mpi-tkr/Makefile.in
|
|
|
2a898e |
===================================================================
|
|
|
2a898e |
--- openmpi-3.1.2.orig/ompi/mpi/fortran/use-mpi-tkr/Makefile.in
|
|
|
2a898e |
+++ openmpi-3.1.2/ompi/mpi/fortran/use-mpi-tkr/Makefile.in
|
|
|
2a898e |
@@ -1809,7 +1809,7 @@ ompi__v_GEN_0 = @echo " GENERATE" $@;
|
|
|
2a898e |
# current directory) because it is generated.
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPI_TKR_BINDINGS_TRUE@AM_FCFLAGS = -I$(top_builddir)/ompi/include -I$(top_srcdir)/ompi/include \
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPI_TKR_BINDINGS_TRUE@ $(OMPI_FC_MODULE_FLAG). -I$(srcdir) -I. \
|
|
|
2a898e |
-@OMPI_BUILD_FORTRAN_USEMPI_TKR_BINDINGS_TRUE@ -I$(top_builddir)/ompi/mpi/fortran/use-mpi-tkr $(FCFLAGS_f90)
|
|
|
2a898e |
+@OMPI_BUILD_FORTRAN_USEMPI_TKR_BINDINGS_TRUE@ -I$(top_builddir)/ompi/mpi/fortran/use-mpi-tkr $(FCFLAGS) $(FCFLAGS_f90)
|
|
|
2a898e |
|
|
|
2a898e |
|
|
|
2a898e |
# Do different things if the top-level configure decided that we're
|
|
|
2a898e |
@@ -1969,13 +1969,13 @@ distclean-compile:
|
|
|
2a898e |
$(AM_V_PPFC)$(LTPPFCCOMPILE) -c -o $@ $<
|
|
|
2a898e |
|
|
|
2a898e |
.f90.o:
|
|
|
2a898e |
- $(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
|
|
|
2a898e |
+ $(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS) $(FCFLAGS_f90) $<
|
|
|
2a898e |
|
|
|
2a898e |
.f90.obj:
|
|
|
2a898e |
- $(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) `$(CYGPATH_W) '$<'`
|
|
|
2a898e |
+ $(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS) $(FCFLAGS_f90) `$(CYGPATH_W) '$<'`
|
|
|
2a898e |
|
|
|
2a898e |
.f90.lo:
|
|
|
2a898e |
- $(AM_V_FC)$(LTFCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
|
|
|
2a898e |
+ $(AM_V_FC)$(LTFCCOMPILE) -c -o $@ $(FCFLAGS) $(FCFLAGS_f90) $<
|
|
|
2a898e |
|
|
|
2a898e |
mostlyclean-libtool:
|
|
|
2a898e |
-rm -f *.lo
|
|
|
2a898e |
Index: openmpi-3.1.2/ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.in
|
|
|
2a898e |
===================================================================
|
|
|
2a898e |
--- openmpi-3.1.2.orig/ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.in
|
|
|
2a898e |
+++ openmpi-3.1.2/ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.in
|
|
|
2a898e |
@@ -1783,7 +1783,7 @@ ompi__v_GEN_0 = @echo " GENERATE" $@;
|
|
|
2a898e |
# mpi" MPI bindings.
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPI_IGNORE_TKR_BINDINGS_TRUE@AM_CPPFLAGS = -DOMPI_PROFILE_LAYER=0 -DOMPI_COMPILING_FORTRAN_WRAPPERS=1
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPI_IGNORE_TKR_BINDINGS_TRUE@AM_FCFLAGS = -I$(top_builddir)/ompi/include -I$(top_srcdir)/ompi/include \
|
|
|
2a898e |
-@OMPI_BUILD_FORTRAN_USEMPI_IGNORE_TKR_BINDINGS_TRUE@ -I$(top_builddir) -I$(top_srcdir) $(FCFLAGS_f90)
|
|
|
2a898e |
+@OMPI_BUILD_FORTRAN_USEMPI_IGNORE_TKR_BINDINGS_TRUE@ -I$(top_builddir) -I$(top_srcdir) $(FCFLAGS) $(FCFLAGS_f90)
|
|
|
2a898e |
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPI_IGNORE_TKR_BINDINGS_TRUE@lib_LTLIBRARIES = lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr.la
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPI_IGNORE_TKR_BINDINGS_TRUE@lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr_la_SOURCES = \
|
|
|
2a898e |
@@ -1904,13 +1904,13 @@ distclean-compile:
|
|
|
2a898e |
$(AM_V_PPFC)$(LTPPFCCOMPILE) -c -o $@ $<
|
|
|
2a898e |
|
|
|
2a898e |
.f90.o:
|
|
|
2a898e |
- $(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
|
|
|
2a898e |
+ $(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS) $(FCFLAGS_f90) $<
|
|
|
2a898e |
|
|
|
2a898e |
.f90.obj:
|
|
|
2a898e |
- $(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) `$(CYGPATH_W) '$<'`
|
|
|
2a898e |
+ $(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS) $(FCFLAGS_f90) `$(CYGPATH_W) '$<'`
|
|
|
2a898e |
|
|
|
2a898e |
.f90.lo:
|
|
|
2a898e |
- $(AM_V_FC)$(LTFCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
|
|
|
2a898e |
+ $(AM_V_FC)$(LTFCCOMPILE) -c -o $@ $(FCFLAGS) $(FCFLAGS_f90) $<
|
|
|
2a898e |
|
|
|
2a898e |
mostlyclean-libtool:
|
|
|
2a898e |
-rm -f *.lo
|
|
|
2a898e |
Index: openmpi-3.1.2/ompi/mpi/fortran/mpiext/Makefile.in
|
|
|
2a898e |
===================================================================
|
|
|
2a898e |
--- openmpi-3.1.2.orig/ompi/mpi/fortran/mpiext/Makefile.in
|
|
|
2a898e |
+++ openmpi-3.1.2/ompi/mpi/fortran/mpiext/Makefile.in
|
|
|
2a898e |
@@ -1723,7 +1723,7 @@ ucx_STATIC_LIBS = @ucx_STATIC_LIBS@
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPI_OR_USEMPIF08_EXT_TRUE@AM_FCFLAGS = -I$(top_builddir)/ompi/include -I$(top_srcdir)/ompi/include \
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPI_OR_USEMPIF08_EXT_TRUE@ $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/base \
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPI_OR_USEMPIF08_EXT_TRUE@ $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi-f08/mod \
|
|
|
2a898e |
-@OMPI_BUILD_FORTRAN_USEMPI_OR_USEMPIF08_EXT_TRUE@ -I$(top_srcdir) $(FCFLAGS_f90)
|
|
|
2a898e |
+@OMPI_BUILD_FORTRAN_USEMPI_OR_USEMPIF08_EXT_TRUE@ -I$(top_srcdir) $(FCFLAGS) $(FCFLAGS_f90)
|
|
|
2a898e |
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPI_OR_USEMPIF08_EXT_TRUE@flibs = $(am__append_1) \
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPI_OR_USEMPIF08_EXT_TRUE@ $(am__append_2)
|
|
|
2a898e |
Index: openmpi-3.1.2/ompi/mpi/fortran/use-mpi-f08/Makefile.in
|
|
|
2a898e |
===================================================================
|
|
|
2a898e |
--- openmpi-3.1.2.orig/ompi/mpi/fortran/use-mpi-f08/Makefile.in
|
|
|
2a898e |
+++ openmpi-3.1.2/ompi/mpi/fortran/use-mpi-f08/Makefile.in
|
|
|
2a898e |
@@ -2870,7 +2870,7 @@ ompi__v_GEN_0 = @echo " GENERATE" $@;
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS_TRUE@ -I$(top_srcdir)/ompi/include \
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS_TRUE@ $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/$(OMPI_FORTRAN_USEMPI_DIR) \
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS_TRUE@ $(OMPI_FC_MODULE_FLAG)mod \
|
|
|
2a898e |
-@OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS_TRUE@ -I$(top_srcdir) $(FCFLAGS_f90)
|
|
|
2a898e |
+@OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS_TRUE@ -I$(top_srcdir) $(FCFLAGS) $(FCFLAGS_f90)
|
|
|
2a898e |
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS_TRUE@MOSTLYCLEANFILES = *.mod
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS_TRUE@lib_LTLIBRARIES = lib@OMPI_LIBMPI_NAME@_usempif08.la
|
|
|
2a898e |
@@ -4444,13 +4444,13 @@ distclean-compile:
|
|
|
2a898e |
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
|
|
|
2a898e |
|
|
|
2a898e |
.f90.o:
|
|
|
2a898e |
- $(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
|
|
|
2a898e |
+ $(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS) $(FCFLAGS_f90) $<
|
|
|
2a898e |
|
|
|
2a898e |
.f90.obj:
|
|
|
2a898e |
- $(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) `$(CYGPATH_W) '$<'`
|
|
|
2a898e |
+ $(AM_V_FC)$(FCCOMPILE) -c -o $@ $(FCFLAGS) $(FCFLAGS_f90) `$(CYGPATH_W) '$<'`
|
|
|
2a898e |
|
|
|
2a898e |
.f90.lo:
|
|
|
2a898e |
- $(AM_V_FC)$(LTFCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
|
|
|
2a898e |
+ $(AM_V_FC)$(LTFCCOMPILE) -c -o $@ $(FCFLAGS) $(FCFLAGS_f90) $<
|
|
|
2a898e |
|
|
|
2a898e |
mostlyclean-libtool:
|
|
|
2a898e |
-rm -f *.lo
|
|
|
2a898e |
Index: openmpi-3.1.2/ompi/mpi/fortran/use-mpi-f08/mod/Makefile.in
|
|
|
2a898e |
===================================================================
|
|
|
2a898e |
--- openmpi-3.1.2.orig/ompi/mpi/fortran/use-mpi-f08/mod/Makefile.in
|
|
|
2a898e |
+++ openmpi-3.1.2/ompi/mpi/fortran/use-mpi-f08/mod/Makefile.in
|
|
|
2a898e |
@@ -1737,7 +1737,7 @@ ompi__v_GEN_0 = @echo " GENERATE" $@;
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS_TRUE@ -I$(top_srcdir)/ompi/include \
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS_TRUE@ $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/$(OMPI_FORTRAN_USEMPI_DIR) \
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS_TRUE@ $(OMPI_FC_MODULE_FLAG). \
|
|
|
2a898e |
-@OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS_TRUE@ -I$(top_srcdir) $(FCFLAGS_f90)
|
|
|
2a898e |
+@OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS_TRUE@ -I$(top_srcdir) $(FCFLAGS) $(FCFLAGS_f90)
|
|
|
2a898e |
|
|
|
2a898e |
@OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS_TRUE@MOSTLYCLEANFILES = *.mod
|
|
|
2a898e |
|