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