Summary: minor, provide malldbg multiarg for MALLOC_PERTURB_
[sxemacs] / m4 / sxe-compiler.m4
index dcde738..12fd03b 100644 (file)
@@ -325,10 +325,6 @@ typedef __gnuc_va_list va_list;]],[[1]])], [dnl
        SXE_LD_EXPORT_DYNAMIC
        dnl in case compiler issues PIE by default which breaks pdump
        SXE_LD_NO_PIE
-
-       ## check whether CC reacts to `extern inline' gnu89 inline declarations
-       ## with a warning
-       SXE_CHECK_CC_EXTERN_INLINE
 ])dnl SXE_CHECK_CC_CHAR
 
 AC_DEFUN([SXE_CHECK_CC_HACKS], [dnl
@@ -611,12 +607,14 @@ AC_DEFUN([SXE_WARNFLAGS], [dnl
        ## Warnings about char subscripts are pretty
        ## pointless, though,
        ## and we use them in various places.
-       SXE_CHECK_COMPILER_FLAGS([-Wsign-compare], [
-               warnflags="$warnflags -Wsign-compare"])
-       SXE_CHECK_COMPILER_FLAGS([-Wno-char-subscripts], [
-               warnflags="$warnflags -Wno-char-subscripts"])
-       SXE_CHECK_COMPILER_FLAGS([-Wundef], [
-               warnflags="$warnflags -Wundef"])
+       if test "${with_maximum_warning_output}" = "yes"; then
+               SXE_CHECK_COMPILER_FLAGS([-Wsign-compare], [
+                       warnflags="$warnflags -Wsign-compare"])
+               SXE_CHECK_COMPILER_FLAGS([-Wno-char-subscripts], [
+                       warnflags="$warnflags -Wno-char-subscripts"])
+               SXE_CHECK_COMPILER_FLAGS([-Wundef], [
+                       warnflags="$warnflags -Wundef"])
+       fi
 
        ## too much at the moment, we rarely define protos
        #warnflags="$warnflags -Wmissing-prototypes -Wstrict-prototypes"
@@ -638,8 +636,6 @@ AC_DEFUN([SXE_WARNFLAGS], [dnl
                warnflags="$warnflags -Wmissing-declarations"])
        SXE_CHECK_COMPILER_FLAGS([-Wmissing-prototypes], [
                warnflags="$warnflags -Wmissing-prototypes"])
-       SXE_CHECK_COMPILER_FLAGS([-Winline], [
-               warnflags="$warnflags -Winline"])
        SXE_CHECK_COMPILER_FLAGS([-Wbad-function-cast], [
                warnflags="$warnflags -Wbad-function-cast"])
        SXE_CHECK_COMPILER_FLAGS([-Wcast-qual], [
@@ -647,25 +643,35 @@ AC_DEFUN([SXE_WARNFLAGS], [dnl
        SXE_CHECK_COMPILER_FLAGS([-Wcast-align], [
                warnflags="$warnflags -Wcast-align"])
 
+       ## too aggressive innit
+       if test "${with_maximum_warning_output}" = "yes"; then
+               SXE_CHECK_COMPILER_FLAGS([-Winline], [
+                       warnflags="$warnflags -Winline"])
+       fi
+
        ## warn about incomplete switches
-       SXE_CHECK_COMPILER_FLAGS([-Wswitch], [
-               warnflags="$warnflags -Wswitch"])
-       SXE_CHECK_COMPILER_FLAGS([-Wswitch-default], [
-               warnflags="$warnflags -Wswitch-default"])
-       SXE_CHECK_COMPILER_FLAGS([-Wswitch-enum], [
-               warnflags="$warnflags -Wswitch-enum"])
+       if test "${with_maximum_warning_output}" = "yes"; then
+               SXE_CHECK_COMPILER_FLAGS([-Wswitch], [
+                       warnflags="$warnflags -Wswitch"])
+               SXE_CHECK_COMPILER_FLAGS([-Wswitch-default], [
+                       warnflags="$warnflags -Wswitch-default"])
+               SXE_CHECK_COMPILER_FLAGS([-Wswitch-enum], [
+                       warnflags="$warnflags -Wswitch-enum"])
+       fi
 
        ## Wunused's
-       SXE_CHECK_COMPILER_FLAGS([-Wunused-function], [
-               warnflags="$warnflags -Wunused-function"])
-       SXE_CHECK_COMPILER_FLAGS([-Wunused-variable], [
-               warnflags="$warnflags -Wunused-variable"])
-       SXE_CHECK_COMPILER_FLAGS([-Wunused-parameter], [
-               warnflags="$warnflags -Wunused-parameter"])
-       SXE_CHECK_COMPILER_FLAGS([-Wunused-value], [
-               warnflags="$warnflags -Wunused-value"])
-       SXE_CHECK_COMPILER_FLAGS([-Wunused], [
-               warnflags="$warnflags -Wunused"])
+       if test "${with_maximum_warning_output}" = "yes"; then
+               SXE_CHECK_COMPILER_FLAGS([-Wunused-function], [
+                       warnflags="$warnflags -Wunused-function"])
+               SXE_CHECK_COMPILER_FLAGS([-Wunused-variable], [
+                       warnflags="$warnflags -Wunused-variable"])
+               SXE_CHECK_COMPILER_FLAGS([-Wunused-parameter], [
+                       warnflags="$warnflags -Wunused-parameter"])
+               SXE_CHECK_COMPILER_FLAGS([-Wunused-value], [
+                       warnflags="$warnflags -Wunused-value"])
+               SXE_CHECK_COMPILER_FLAGS([-Wunused], [
+                       warnflags="$warnflags -Wunused"])
+       fi
 
        ## icc
        SXE_CHECK_COMPILER_FLAGS([-Wreorder], [
@@ -681,6 +687,12 @@ AC_DEFUN([SXE_WARNFLAGS], [dnl
        SXE_CHECK_COMPILER_FLAGS([-fno-strict-aliasing], [
                warnflags="$warnflags -fno-strict-aliasing"])
 
+       ## icc specific
+       SXE_CHECK_COMPILER_FLAGS([-diag-disable 10237], [dnl
+               warnflags="${warnflags} -diag-disable 10237"], [
+               SXE_CHECK_COMPILER_FLAGS([-wd 10237], [dnl
+                       warnflags="${warnflags} -wd 10237"])])
+
        AC_MSG_CHECKING([for preferred warning flags])
        AC_MSG_RESULT([${warnflags}])
 ])dnl SXE_WARNFLAGS
@@ -756,6 +768,19 @@ AC_DEFUN([SXE_FEATFLAGS], [dnl
        ## (and hence PIE off) and hope bug 16 remains fixed
        SXE_CHECK_COMPILER_FLAGS([-nopie],
                [featflags="$featflags -nopie"])
+
+       ## icc and gcc related
+       ## check if some stuff can be staticalised
+       ## actually requires SXE_WARNFLAGS so warnings would be disabled
+       ## that affect the outcome of the following tests
+       SXE_CHECK_COMPILER_FLAGS([-static-intel], [
+               featflags="${featflags} -static-intel"
+               XCCLDFLAGS="${XCCLDFLAGS} -static-intel"], [:], [${SXE_CFLAGS}])
+       SXE_CHECK_COMPILER_FLAGS([-static-libgcc], [
+               featflags="${featflags} -static-libgcc"
+               XCCLDFLAGS="${XCCLDFLAGS} -static-libgcc"], [:], [${SXE_CFLAGS}])
+
+       AC_SUBST([XCCLDFLAGS])
 ])dnl SXE_FEATFLAGS
 
 
@@ -960,14 +985,6 @@ dnl                [optiflags="$optiflags -fstrict-aliasing"])
        SXE_CHECK_COMPILER_FLAGS([-fsection-anchors],
                [optiflags="$optiflags -fsection-anchors"])
 
-dnl    ## actually this belongs to error-checking stuff
-dnl    SXE_CHECK_COMPILER_FLAGS([-fstack-protector],
-dnl            [optiflags="$optiflags -fstack-protector"])
-dnl    if test "$sxe_cv_c_flags__fstack_protector" = "yes"; then
-dnl            ## just check for ssp in this case
-dnl            AC_CHECK_LIB([ssp], [__stack_chk_guard])
-dnl    fi
-
        SXE_CHECK_COMPILER_FLAGS([-fbranch-target-load-optimize])
        SXE_CHECK_COMPILER_FLAGS([-fbranch-target-load-optimize2])
        if test "$sxe_cv_c_flags__fbranch_target_load_optimize2" = "yes"; then
@@ -1029,6 +1046,8 @@ dnl       fi
 ##### http://autoconf-archive.cryp.to/ax_check_compiler_flags.html
 ## renamed the prefix to SXE_
 AC_DEFUN([SXE_CHECK_COMPILER_FLAGS], [dnl
+dnl SXE_CHECK_COMPILER_FLAGS(<FLAG>, <ACTION-IF-FOUND>, <ACTION-IF-NOT-FOUND>,
+dnl     <ADDITIONAL-FLAGS>)
        AC_MSG_CHECKING([whether _AC_LANG compiler accepts $1])
 
        dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname:
@@ -1036,13 +1055,13 @@ AC_DEFUN([SXE_CHECK_COMPILER_FLAGS], [dnl
        AS_LITERAL_IF([$1], [
                AC_CACHE_VAL(AS_TR_SH(sxe_cv_[]_AC_LANG_ABBREV[]_flags_$1), [
                        sxe_save_FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
-                       _AC_LANG_PREFIX[]FLAGS="$1"
+                       _AC_LANG_PREFIX[]FLAGS="$4 $1"
                        AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
                                AS_TR_SH(sxe_cv_[]_AC_LANG_ABBREV[]_flags_$1)="yes",
                                AS_TR_SH(sxe_cv_[]_AC_LANG_ABBREV[]_flags_$1)="no")
                        _AC_LANG_PREFIX[]FLAGS=$sxe_save_FLAGS])], [
                sxe_save_FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
-               _AC_LANG_PREFIX[]FLAGS="$1"
+               _AC_LANG_PREFIX[]FLAGS="$4 $1"
                AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
                        eval AS_TR_SH(sxe_cv_[]_AC_LANG_ABBREV[]_flags_$1)="yes",
                        eval AS_TR_SH(sxe_cv_[]_AC_LANG_ABBREV[]_flags_$1)="no")
@@ -1585,6 +1604,16 @@ extern void f(void*restrict[]);
        AC_MSG_RESULT([$typeofname])
 ])dnl SXE_CHECK_BROKEN_RESTRICT        
 
+AC_DEFUN([SXE_STACK_FLAGS], [dnl
+       ## actually this belongs to error-checking stuff
+       SXE_CHECK_COMPILER_FLAGS([-fstack-protector],
+               [diagflags="${diagflags} -fstack-protector"])
+       if test "${sxe_cv_c_flags__fstack_protector}" = "yes"; then
+               ## just check for ssp in this case
+               AC_CHECK_LIB([ssp], [__stack_chk_guard])
+       fi
+])dnl SXE_STACK_FLAGS
+
 dnl recommended interface macros
 ## compiler wrapper
 AC_DEFUN([SXE_CHECK_CC], [dnl
@@ -1635,48 +1664,82 @@ AC_DEFUN([SXE_CHECK_CFLAGS], [dnl
        dnl #### This may need to be overhauled so that all of SXEMACS_CC's flags
        dnl are handled separately, not just the xe_cflags_warning stuff.
 
+       ## diagnostic stuff and error checking
+       ## this may somehow be in contradiction to optimisation flags later on
+       ## so we issue the tests right here
+       if test "${with_error_checking_stack}" = "yes"; then
+               SXE_STACK_FLAGS
+       fi
+       if test "${with_error_checking_malldbg}" = "yes"; then
+               ## keep MALLOC_PERTURB_ and friends?
+               :
+       else
+               EXTRA_BATCHENV="MALLOC_PERTURB_= MALLOC_CHECK_="
+               AC_SUBST([EXTRA_BATCHENV])
+       fi
+       SXE_CFLAGS="${SXE_CFLAGS} ${diagflags}"
+
        ## Use either command line flag, environment var, or autodetection
        if test "$with_ridiculously_aggressive_optimisations" = "yes"; then
                CFLAGS=""
                SXE_DEBUGFLAGS
                SXE_WARNFLAGS
                SXE_OPTIFLAGS
+               SXE_CFLAGS="$SXE_CFLAGS $debugflags $optiflags $warnflags"
+
                SXE_FEATFLAGS
-               SXE_CFLAGS="$debugflags $featflags $optiflags $warnflags"
+               SXE_CFLAGS="$SXE_CFLAGS $featflags"
+
        elif test "$CFLAGS_uspecified_p" = "no" -o \
                "$ac_test_CFLAGS" != "set"; then
                SXE_DEBUGFLAGS
                SXE_WARNFLAGS
-               SXE_FEATFLAGS
 
                ## the old settings
                ## Following values of CFLAGS are known to work well.
                ## Should we take debugging options into consideration?
-               if test "$GCC" = "yes"; then
-                       optiflags="-O3"
-               elif test "$__SUNPRO_C" = "yes"; then
-                       case "$opsys" in
-                       sol2    ) optiflags="-xO4" ;;
-                       sunos4* ) optiflags="-xO2" ;;
-                       esac
-               elif test "$__DECC" = "yes"; then
-                       optiflags="-O3"
-               elif test "$CC" = "xlc"; then
-                       optiflags="-g -O3 -qstrict -qnoansialias -qlibansi -qro -qmaxmem=20000"
-               elif test "$__ICC" = "yes"; then
-                       optiflags="-g -O3 -Ob2"
-               ### Add optimal CFLAGS support for other compilers HERE!
-               else
-                       optiflags="-O" ## The only POSIX-approved flag
+               SXE_CHECK_COMPILER_FLAGS([-xO4], [dnl
+                       ## ah, it's sunos4*
+                       optiflags="${optiflags} -xO4"], [dnl
+                       SXE_CHECK_COMPILER_FLAGS([-xO2], [dnl
+                               ## oh, a sol2
+                               optiflags="${optiflags} -xO2"])])
+               SXE_CHECK_COMPILER_FLAGS([-O3], [dnl
+                       ## gcc, icc, decc, et al.
+                       optiflags="${optiflags} -O3"])
+
+               ## xlc specific
+               SXE_CHECK_COMPILER_FLAGS([-qnoansialias -qlibansi], [dnl
+                       optiflags="${optiflags} -qnoansialias -qlibansi"])
+               SXE_CHECK_COMPILER_FLAGS([-qro -qmaxmem=20000], [dnl
+                       optiflags="${optiflags} -qro -qmaxmem=20000"])
+
+               ## icc specific
+               SXE_CHECK_COMPILER_FLAGS([-inline-level=2], [dnl
+                       ## ah, one of the new flavours, tasty
+                       optiflags="${optiflags} -inline-level=2"], [dnl
+                       SXE_CHECK_COMPILER_FLAGS([-Ob2], [dnl
+                               ## deprecated nowadays
+                               optiflags="${optiflags} -Ob2"])])
+
+               ## final check
+               if test -z "${optiflags}"; then
+                       SXE_CHECK_COMPILER_FLAGS([-O], [dnl
+                               ## The only POSIX-approved flag
+                               optiflags="-O"])
                fi
 
-               SXE_CFLAGS="$debugflags $featflags $optiflags $warnflags"
+               SXE_CFLAGS="$SXE_CFLAGS $debugflags $optiflags $warnflags"
+
+               SXE_FEATFLAGS
+               SXE_CFLAGS="$SXE_CFLAGS $featflags"
        else
-               SXE_CFLAGS=${USER_CFLAGS}
+               SXE_CFLAGS="${SXE_CFLAGS} ${USER_CFLAGS}"
                featflags=""
                debugflags=""
                optiflags=""
                warnflags=""
+               diagflags=""
        fi
 
        ## unset the werror flag again