[PATCH] Macro definition parameter parsing

[gcc.git] / libcpp / configure.ac

diff --git a/libcpp/configure.ac b/libcpp/configure.ac
index 799301f072202d00790cda05f0fdc55f425db441..d0a59dc3e0f8adad7bfe468853f7700de48ec588 100644 (file)
--- a/libcpp/configure.ac
+++ b/libcpp/configure.ac
@@ -64,6 +64,10 @@ AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 AC_TYPE_UINTPTR_T
 AC_CHECK_TYPE(ptrdiff_t, int)
+AC_TYPE_UINT64_T
+if test x"$ac_cv_c_uint64_t" = x"no"; then
+  AC_MSG_ERROR([uint64_t not found])
+fi
 AC_STRUCT_TM
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
@@ -148,9 +152,11 @@ for check in release $ac_checking_flags
 do
        case $check in
        # these set all the flags to specific states
-       yes|all) ac_checking=1 ; ac_valgrind_checking= ;;
-       no|none|release) ac_checking= ; ac_valgrind_checking= ;;
+       yes|all) ac_checking=1 ; ac_assert_checking=1 ; ac_valgrind_checking= ;;
+       no|none) ac_checking= ; ac_assert_checking= ; ac_valgrind_checking= ;;
+       release) ac_checking= ; ac_assert_checking=1 ; ac_valgrind_checking= ;;
        # these enable particular checks
+       assert) ac_assert_checking=1 ;;
        misc) ac_checking=1 ;;
        valgrind) ac_valgrind_checking=1 ;;
        # accept
@@ -160,8 +166,15 @@ done
 IFS="$ac_save_IFS"
                 
 if test x$ac_checking != x ; then
-  AC_DEFINE(ENABLE_CHECKING, 1,
-[Define if you want more run-time sanity checks.])
+  AC_DEFINE(CHECKING_P, 1,
+[Define to 1 if you want more run-time sanity checks.])
+else
+  AC_DEFINE(CHECKING_P, 0)
+fi
+
+if test x$ac_assert_checking != x ; then
+  AC_DEFINE(ENABLE_ASSERT_CHECKING, 1,
+[Define if you want assertions enabled.  This is a cheap check.])
 fi
 
 if test x$ac_valgrind_checking != x ; then
@@ -180,39 +193,6 @@ if test $enable_canonical_system_headers != no; then
             1, [Define to enable system headers canonicalization.])
 fi
 
-m4_changequote(,)
-case $target in
-       aarch64*-*-* | \
-       alpha*-*-* | \
-       arm*-*-* | \
-       x86_64-*-* | \
-       ia64-*-* | \
-       hppa*64*-*-* | \
-       i[34567]86-*-* | x86_64-*-solaris2.1[0-9]* | \
-       mips*-*-* | \
-       mmix-*-* | \
-       powerpc*-*-* | \
-       rs6000*-*-* | \
-       s390*-*-* | \
-       sparc*-*-* | \
-       spu-*-* | \
-       sh[123456789lbe]*-*-* | sh-*-* | \
-       tilegx-*-* | tilepro-*-* )
-               need_64bit_hwint=yes ;;
-       *)
-               need_64bit_hwint=no ;;
-esac
-
-case $need_64bit_hwint:$ac_cv_sizeof_long in
-       *:8 | no:*) host_wide_int=long ;;
-       *) host_wide_int='long long' ;;
-esac
-m4_changequote([,])
-
-AC_DEFINE_UNQUOTED(HOST_WIDE_INT, $host_wide_int,
-[Define to the widest efficient host integer type at least
-   as wide as the target's size_t type.])
-
 case $target in
   i?86-* | x86_64-*)
     AC_TRY_COMPILE([], [asm ("pcmpestri %0, %%xmm0, %%xmm1" : : "i"(0))],
@@ -220,6 +200,28 @@ case $target in
                 [Define to 1 if you can assemble SSE4 insns.])])
 esac
 
+# Enable --enable-host-shared.
+AC_ARG_ENABLE(host-shared,
+[AS_HELP_STRING([--enable-host-shared],
+               [build host code as shared libraries])],
+[PICFLAG=-fPIC], [PICFLAG=])
+AC_SUBST(PICFLAG)
+
+AC_ARG_ENABLE(valgrind-annotations,
+[AS_HELP_STRING([--enable-valgrind-annotations],
+               [enable valgrind runtime interaction])], [],
+[enable_valgrind_annotations=no])
+if test x$enable_valgrind_annotations != xno \
+    || test x$ac_valgrind_checking != x; then
+  if (test $have_valgrind_h = no \
+      && test $gcc_cv_header_memcheck_h = no \
+      && test $gcc_cv_header_valgrind_memcheck_h = no); then
+    AC_MSG_ERROR([*** Can't find valgrind/memcheck.h, memcheck.h or valgrind.h])
+  fi
+  AC_DEFINE(ENABLE_VALGRIND_ANNOTATIONS, 1,
+[Define to get calls to the valgrind runtime enabled.])
+fi
+
 # Output.
 
 AC_CONFIG_HEADERS(config.h:config.in, [echo timestamp > stamp-h1])