gdbinit

[m6w6/ext-psi] / m4 / psi / psi_type.m4

diff --git a/m4/psi/psi_type.m4 b/m4/psi/psi_type.m4
index b3940a4617e45a3915fe0e7767e426c3a8b7a48a..8f2956f96bb7dc692027d0144f5dcebaefb0fdf7 100644 (file)
--- a/m4/psi/psi_type.m4
+++ b/m4/psi/psi_type.m4
@@ -68,7 +68,7 @@ AC_DEFUN(PSI_STDTYPE, [
        ifdef(AS_TR_CPP(AC_TYPE_$1), AS_TR_CPP(AC_TYPE_$1))
        PSI_CHECK_SIZEOF($1)
        if PSI_SH_TEST_SIZEOF($1); then
-               m4_case([$1],
+               m4_case(ifelse(,[$2],[$1],[$2]),
                [bool],[psi_add_stdtype "{PSI_T_BOOL, \"bool\", NULL}"],
                [float],[psi_add_stdtype "{PSI_T_FLOAT, \"float\", NULL}"],
                [double],[psi_add_stdtype "{PSI_T_DOUBLE, \"double\", NULL}"],
@@ -193,34 +193,9 @@ AC_DEFUN(PSI_TYPE_PAIR, [m4_case(m4_bregexp([$1], [^\w+], [\&]),
 dnl PSI_CHECK_STD_TYPES()
 dnl Checks for standard ANSI-C, stdint and stdbool types.
 AC_DEFUN(PSI_CHECK_STD_TYPES, [
-       AC_CHECK_HEADERS(stdint.h)
+       
        AC_HEADER_STDBOOL
 
-       AC_TYPE_INT8_T
-       PSI_CHECK_SIZEOF(int8_t)
-       AC_CHECK_ALIGNOF(int8_t)
-       AC_TYPE_UINT8_T
-       PSI_CHECK_SIZEOF(uint8_t)
-       AC_CHECK_ALIGNOF(uint8_t)
-       AC_TYPE_INT16_T
-       PSI_CHECK_SIZEOF(int16_t)
-       AC_CHECK_ALIGNOF(int16_t)
-       AC_TYPE_UINT16_T
-       PSI_CHECK_SIZEOF(uint16_t)
-       AC_CHECK_ALIGNOF(uint16_t)
-       AC_TYPE_INT32_T
-       PSI_CHECK_SIZEOF(int32_t)
-       AC_CHECK_ALIGNOF(int32_t)
-       AC_TYPE_UINT32_T
-       PSI_CHECK_SIZEOF(uint32_t)
-       AC_CHECK_ALIGNOF(uint32_t)
-       AC_TYPE_INT64_T
-       PSI_CHECK_SIZEOF(int64_t)
-       AC_CHECK_ALIGNOF(int64_t)
-       AC_TYPE_UINT64_T
-       PSI_CHECK_SIZEOF(uint64_t)
-       AC_CHECK_ALIGNOF(uint64_t)
-
        PSI_CHECK_SIZEOF(void *)
        AC_CHECK_ALIGNOF(void *)
 
@@ -280,4 +255,14 @@ AC_DEFUN(PSI_CHECK_STD_TYPES, [
        PSI_STDTYPE(long long unsigned int, uint)
        dnl this must come after the check for "unsigned long long int"; autoconf, wth?
        PSI_STDTYPE(long long int, int)
+       
+       AC_CHECK_TYPE(__int128, [
+               AC_DEFINE([HAVE_INT128], [1], [ ])
+               AC_CHECK_ALIGNOF(__int128)
+               PSI_STDTYPE(__int128, int)
+               PSI_STDTYPE(signed __int128, int)
+               PSI_STDTYPE(unsigned __int128, uint)
+       ])
+       
+       PSI_STDTYPE(_Float128)
 ])