Attachment #519054 for bug #646910




++ b/config/ompi_fortran_check_real16_c_equiv.m4

                             [AC_MSG_CHECKING([if intel compiler _Quad == REAL*16])
                              CFLAGS_save="$CFLAGS"
                              CFLAGS="$CFLAGS -Qoption,cpp,--extended_float_types"
                              OPAL_FLAGS_UNIQ([CFLAGS])
                              OMPI_FORTRAN_CHECK_REAL16_EQUIV_TYPE([_Quad], [q])
                              AS_IF([test "$happy" = "yes"],
                                    [OMPI_FORTRAN_REAL16_C_TYPE="_Quad"

                             ])
                       AS_IF([test "$opal_cv_c_compiler_vendor" = "gnu" && test "$ac_cv_type___float128" = "yes"],
                             [AC_MSG_CHECKING([if gnu compiler __float128 == REAL*16])
                              OPAL_FLAGS_UNIQ([CFLAGS])
                              OMPI_FORTRAN_CHECK_REAL16_EQUIV_TYPE([__float128], [q])
                              AS_IF([test "$happy" = "yes"],
                                    [OMPI_FORTRAN_REAL16_C_TYPE="__float128"
++ b/config/ompi_setup_cxx.m4

    # Do we want debugging?
    if test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no" ; then
        CXXFLAGS="$CXXFLAGS -g"
        OPAL_FLAGS_UNIQ(CXXFLAGS)
        AC_MSG_WARN([-g has been added to CXXFLAGS (--enable-debug)])
    fi


        fi

        CXXFLAGS="$CXXFLAGS $add"
        OPAL_FLAGS_UNIQ(CXXFLAGS)
        if test "$add" != "" ; then
            AC_MSG_WARN([$add has been added to CXXFLAGS (--enable-picky)])
        fi

            add=" -finline-functions"
        fi
        CXXFLAGS="$CXXFLAGS_orig$add"
        OPAL_FLAGS_UNIQ(CXXFLAGS)
        if test "$add" != "" ; then
            AC_MSG_WARN([$add has been added to CXXFLAGS])
        fi
++ b/config/ompi_setup_fc.m4


    AS_IF([test $ompi_fc_happy -eq 1 && test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no"],
          [FCFLAGS="$FCFLAGS -g"
           OPAL_FLAGS_UNIQ(FCFLAGS)
           AC_MSG_WARN([-g has been added to FCFLAGS (--enable-debug)])
          ])

++ b/config/opal_setup_cc.m4

            OPAL_WRAPPER_FLAGS_ADD([CFLAGS], [$OPAL_COVERAGE_FLAGS])
            OPAL_WRAPPER_FLAGS_ADD([LDFLAGS], [$OPAL_COVERAGE_FLAGS])

            OPAL_FLAGS_UNIQ(CFLAGS)
            OPAL_FLAGS_UNIQ(LDFLAGS)
            AC_MSG_WARN([$OPAL_COVERAGE_FLAGS has been added to CFLAGS (--enable-coverage)])


    if test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no" ; then
        CFLAGS="$CFLAGS -g"

        OPAL_FLAGS_UNIQ(CFLAGS)
        AC_MSG_WARN([-g has been added to CFLAGS (--enable-debug)])
    fi


        fi

        CFLAGS="$CFLAGS_orig $add"
        OPAL_FLAGS_UNIQ(CFLAGS)
        AC_MSG_WARN([$add has been added to CFLAGS (--enable-picky)])
        unset add
    fi

        fi
        CFLAGS="$CFLAGS_orig$add"

        OPAL_FLAGS_UNIQ(CFLAGS)
        AC_MSG_WARN([$add has been added to CFLAGS])
        unset add
    fi

        fi

        CFLAGS="${CFLAGS_orig}${add}"
        OPAL_FLAGS_UNIQ([CFLAGS])
        if test "$add" != "" ; then
            AC_MSG_WARN([$add has been added to CFLAGS])
        fi
++ b/config/opal_setup_cxx.m4

    # Do we want debugging?
    if test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no" ; then
        CXXFLAGS="$CXXFLAGS -g"
        OPAL_FLAGS_UNIQ(CXXFLAGS)
        AC_MSG_WARN([-g has been added to CXXFLAGS (--enable-debug)])
    fi


        fi

        CXXFLAGS="$CXXFLAGS $add"
        OPAL_FLAGS_UNIQ(CXXFLAGS)
        if test "$add" != "" ; then
            AC_MSG_WARN([$add has been added to CXXFLAGS (--enable-picky)])
        fi

            add=" -finline-functions"
        fi
        CXXFLAGS="$CXXFLAGS_orig$add"
        OPAL_FLAGS_UNIQ(CXXFLAGS)
        if test "$add" != "" ; then
            AC_MSG_WARN([$add has been added to CXXFLAGS])
        fi

Return to bug 646910

Line Link Here

(-)file_not_specified_in_diff (-19 / +5 lines)
0	-- a/config/ompi_fortran_check_real16_c_equiv.m4	0	++ b/config/ompi_fortran_check_real16_c_equiv.m4
Lines 49-55 Link Here
49	[AC_MSG_CHECKING([if intel compiler _Quad == REAL*16])	49	[AC_MSG_CHECKING([if intel compiler _Quad == REAL*16])
50	CFLAGS_save="$CFLAGS"	50	CFLAGS_save="$CFLAGS"
51	CFLAGS="$CFLAGS -Qoption,cpp,--extended_float_types"	51	CFLAGS="$CFLAGS -Qoption,cpp,--extended_float_types"
52	OPAL_FLAGS_UNIQ([CFLAGS])
53	OMPI_FORTRAN_CHECK_REAL16_EQUIV_TYPE([_Quad], [q])	52	OMPI_FORTRAN_CHECK_REAL16_EQUIV_TYPE([_Quad], [q])
54	AS_IF([test "$happy" = "yes"],	53	AS_IF([test "$happy" = "yes"],
55	[OMPI_FORTRAN_REAL16_C_TYPE="_Quad"	54	[OMPI_FORTRAN_REAL16_C_TYPE="_Quad"
Lines 59-65 Link Here
59	])	58	])
60	AS_IF([test "$opal_cv_c_compiler_vendor" = "gnu" && test "$ac_cv_type___float128" = "yes"],	59	AS_IF([test "$opal_cv_c_compiler_vendor" = "gnu" && test "$ac_cv_type___float128" = "yes"],
61	[AC_MSG_CHECKING([if gnu compiler __float128 == REAL*16])	60	[AC_MSG_CHECKING([if gnu compiler __float128 == REAL*16])
62	OPAL_FLAGS_UNIQ([CFLAGS])
63	OMPI_FORTRAN_CHECK_REAL16_EQUIV_TYPE([__float128], [q])	61	OMPI_FORTRAN_CHECK_REAL16_EQUIV_TYPE([__float128], [q])
64	AS_IF([test "$happy" = "yes"],	62	AS_IF([test "$happy" = "yes"],
65	[OMPI_FORTRAN_REAL16_C_TYPE="__float128"	63	[OMPI_FORTRAN_REAL16_C_TYPE="__float128"
66	-- a/config/ompi_setup_cxx.m4	64	++ b/config/ompi_setup_cxx.m4
Lines 162-168 Link Here
162	# Do we want debugging?	162	# Do we want debugging?
163	if test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no" ; then	163	if test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no" ; then
164	CXXFLAGS="$CXXFLAGS -g"	164	CXXFLAGS="$CXXFLAGS -g"
165	OPAL_FLAGS_UNIQ(CXXFLAGS)
166	AC_MSG_WARN([-g has been added to CXXFLAGS (--enable-debug)])	165	AC_MSG_WARN([-g has been added to CXXFLAGS (--enable-debug)])
167	fi	166	fi
168		167
Lines 204-210 Link Here
204	fi	203	fi
205		204
206	CXXFLAGS="$CXXFLAGS $add"	205	CXXFLAGS="$CXXFLAGS $add"
207	OPAL_FLAGS_UNIQ(CXXFLAGS)
208	if test "$add" != "" ; then	206	if test "$add" != "" ; then
209	AC_MSG_WARN([$add has been added to CXXFLAGS (--enable-picky)])	207	AC_MSG_WARN([$add has been added to CXXFLAGS (--enable-picky)])
210	fi	208	fi
Lines 227-233 Link Here
227	add=" -finline-functions"	225	add=" -finline-functions"
228	fi	226	fi
229	CXXFLAGS="$CXXFLAGS_orig$add"	227	CXXFLAGS="$CXXFLAGS_orig$add"
230	OPAL_FLAGS_UNIQ(CXXFLAGS)
231	if test "$add" != "" ; then	228	if test "$add" != "" ; then
232	AC_MSG_WARN([$add has been added to CXXFLAGS])	229	AC_MSG_WARN([$add has been added to CXXFLAGS])
233	fi	230	fi
234	-- a/config/ompi_setup_fc.m4	231	++ b/config/ompi_setup_fc.m4
Lines 68-74 Link Here
68		68
69	AS_IF([test $ompi_fc_happy -eq 1 && test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no"],	69	AS_IF([test $ompi_fc_happy -eq 1 && test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no"],
70	[FCFLAGS="$FCFLAGS -g"	70	[FCFLAGS="$FCFLAGS -g"
71	OPAL_FLAGS_UNIQ(FCFLAGS)
72	AC_MSG_WARN([-g has been added to FCFLAGS (--enable-debug)])	71	AC_MSG_WARN([-g has been added to FCFLAGS (--enable-debug)])
73	])	72	])
74		73
75	-- a/config/opal_setup_cc.m4	74	++ b/config/opal_setup_cc.m4
Lines 105-111 Link Here
105	OPAL_WRAPPER_FLAGS_ADD([CFLAGS], [$OPAL_COVERAGE_FLAGS])	105	OPAL_WRAPPER_FLAGS_ADD([CFLAGS], [$OPAL_COVERAGE_FLAGS])
106	OPAL_WRAPPER_FLAGS_ADD([LDFLAGS], [$OPAL_COVERAGE_FLAGS])	106	OPAL_WRAPPER_FLAGS_ADD([LDFLAGS], [$OPAL_COVERAGE_FLAGS])
107		107
108	OPAL_FLAGS_UNIQ(CFLAGS)
109	OPAL_FLAGS_UNIQ(LDFLAGS)	108	OPAL_FLAGS_UNIQ(LDFLAGS)
110	AC_MSG_WARN([$OPAL_COVERAGE_FLAGS has been added to CFLAGS (--enable-coverage)])	109	AC_MSG_WARN([$OPAL_COVERAGE_FLAGS has been added to CFLAGS (--enable-coverage)])
111		110
Lines 120-126 Link Here
120	if test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no" ; then	119	if test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no" ; then
121	CFLAGS="$CFLAGS -g"	120	CFLAGS="$CFLAGS -g"
122		121
123	OPAL_FLAGS_UNIQ(CFLAGS)
124	AC_MSG_WARN([-g has been added to CFLAGS (--enable-debug)])	122	AC_MSG_WARN([-g has been added to CFLAGS (--enable-debug)])
125	fi	123	fi
126		124
Lines 186-192 Link Here
186	fi	184	fi
187		185
188	CFLAGS="$CFLAGS_orig $add"	186	CFLAGS="$CFLAGS_orig $add"
189	OPAL_FLAGS_UNIQ(CFLAGS)
190	AC_MSG_WARN([$add has been added to CFLAGS (--enable-picky)])	187	AC_MSG_WARN([$add has been added to CFLAGS (--enable-picky)])
191	unset add	188	unset add
192	fi	189	fi
Lines 236-242 Link Here
236	fi	233	fi
237	CFLAGS="$CFLAGS_orig$add"	234	CFLAGS="$CFLAGS_orig$add"
238		235
239	OPAL_FLAGS_UNIQ(CFLAGS)
240	AC_MSG_WARN([$add has been added to CFLAGS])	236	AC_MSG_WARN([$add has been added to CFLAGS])
241	unset add	237	unset add
242	fi	238	fi
Lines 265-271 Link Here
265	fi	261	fi
266		262
267	CFLAGS="${CFLAGS_orig}${add}"	263	CFLAGS="${CFLAGS_orig}${add}"
268	OPAL_FLAGS_UNIQ([CFLAGS])
269	if test "$add" != "" ; then	264	if test "$add" != "" ; then
270	AC_MSG_WARN([$add has been added to CFLAGS])	265	AC_MSG_WARN([$add has been added to CFLAGS])
271	fi	266	fi
272	-- a/config/opal_setup_cxx.m4	267	++ b/config/opal_setup_cxx.m4
Lines 96-102 Link Here
96	# Do we want debugging?	96	# Do we want debugging?
97	if test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no" ; then	97	if test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no" ; then
98	CXXFLAGS="$CXXFLAGS -g"	98	CXXFLAGS="$CXXFLAGS -g"
99	OPAL_FLAGS_UNIQ(CXXFLAGS)
100	AC_MSG_WARN([-g has been added to CXXFLAGS (--enable-debug)])	99	AC_MSG_WARN([-g has been added to CXXFLAGS (--enable-debug)])
101	fi	100	fi
102		101
Lines 142-148 Link Here
142	fi	141	fi
143		142
144	CXXFLAGS="$CXXFLAGS $add"	143	CXXFLAGS="$CXXFLAGS $add"
145	OPAL_FLAGS_UNIQ(CXXFLAGS)
146	if test "$add" != "" ; then	144	if test "$add" != "" ; then
147	AC_MSG_WARN([$add has been added to CXXFLAGS (--enable-picky)])	145	AC_MSG_WARN([$add has been added to CXXFLAGS (--enable-picky)])
148	fi	146	fi
Lines 165-171 Link Here
165	add=" -finline-functions"	163	add=" -finline-functions"
166	fi	164	fi
167	CXXFLAGS="$CXXFLAGS_orig$add"	165	CXXFLAGS="$CXXFLAGS_orig$add"
168	OPAL_FLAGS_UNIQ(CXXFLAGS)
169	if test "$add" != "" ; then	166	if test "$add" != "" ; then
170	AC_MSG_WARN([$add has been added to CXXFLAGS])	167	AC_MSG_WARN([$add has been added to CXXFLAGS])
171	fi	168	fi