com php-src: Merge branch 'PHP-7.1': acinclude.m4
| From: | Joe Watkins | Date: | Fri, 06 Jan 2017 16:24:10 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.1': acinclude.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96573@lists.php.net to get a copy of this message | ||
Commit: bb513f15e1c8006bc323fe2c641fb7aa839e7853
Author: Joe Watkins <krakjoe@php.net> Fri, 6 Jan 2017 16:24:10 +0000
Parents: 8e447eafd9adae37fb476bb503e7d62bbf52b33c c50f61b9b06d65ed2391e7751a2adbdf8db91754
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bb513f15e1c8006bc323fe2c641fb7aa839e7853
Log:
Merge branch 'PHP-7.1'
* PHP-7.1:
Test request47456.phpt for PR 1303
Changed paths:
MM acinclude.m4
Diff:
diff --cc acinclude.m4
index dc75c0a,1a4ac7c..61de6cb
--- a/acinclude.m4
+++ b/acinclude.m4
@@@ -3099,125 -3110,5 +3099,126 @@@ AC_DEFUN([PHP_CHECK_BUILTIN_CTZLL],
])
++<<<<<<< HEAD
+dnl PHP_CHECK_BUILTIN_SMULL_OVERFLOW
+AC_DEFUN([PHP_CHECK_BUILTIN_SMULL_OVERFLOW], [
+ AC_MSG_CHECKING([for __builtin_smull_overflow])
+
+ AC_TRY_LINK(, [
+ long tmpvar;
+ return __builtin_smull_overflow(3, 7, &tmpvar);
+ ], [
+ have_builtin_smull_overflow=1
+ AC_MSG_RESULT([yes])
+ ], [
+ have_builtin_smull_overflow=0
+ AC_MSG_RESULT([no])
+ ])
+
+ AC_DEFINE_UNQUOTED([PHP_HAVE_BUILTIN_SMULL_OVERFLOW],
+ [$have_builtin_smull_overflow], [Whether the compiler supports __builtin_smull_overflow])
+
+])
+
+dnl PHP_CHECK_BUILTIN_SMULLL_OVERFLOW
+AC_DEFUN([PHP_CHECK_BUILTIN_SMULLL_OVERFLOW], [
+ AC_MSG_CHECKING([for __builtin_smulll_overflow])
+
+ AC_TRY_LINK(, [
+ long long tmpvar;
+ return __builtin_smulll_overflow(3, 7, &tmpvar);
+ ], [
+ have_builtin_smulll_overflow=1
+ AC_MSG_RESULT([yes])
+ ], [
+ have_builtin_smulll_overflow=0
+ AC_MSG_RESULT([no])
+ ])
+
+ AC_DEFINE_UNQUOTED([PHP_HAVE_BUILTIN_SMULLL_OVERFLOW],
+ [$have_builtin_smulll_overflow], [Whether the compiler supports __builtin_smulll_overflow])
+
+])
+
+dnl PHP_CHECK_BUILTIN_SADDL_OVERFLOW
+AC_DEFUN([PHP_CHECK_BUILTIN_SADDL_OVERFLOW], [
+ AC_MSG_CHECKING([for __builtin_saddl_overflow])
+
+ AC_TRY_LINK(, [
+ long tmpvar;
+ return __builtin_saddl_overflow(3, 7, &tmpvar);
+ ], [
+ have_builtin_saddl_overflow=1
+ AC_MSG_RESULT([yes])
+ ], [
+ have_builtin_saddl_overflow=0
+ AC_MSG_RESULT([no])
+ ])
+
+ AC_DEFINE_UNQUOTED([PHP_HAVE_BUILTIN_SADDL_OVERFLOW],
+ [$have_builtin_saddl_overflow], [Whether the compiler supports __builtin_saddl_overflow])
+
+])
+
+dnl PHP_CHECK_BUILTIN_SADDLL_OVERFLOW
+AC_DEFUN([PHP_CHECK_BUILTIN_SADDLL_OVERFLOW], [
+ AC_MSG_CHECKING([for __builtin_saddll_overflow])
+
+ AC_TRY_LINK(, [
+ long long tmpvar;
+ return __builtin_saddll_overflow(3, 7, &tmpvar);
+ ], [
+ have_builtin_saddll_overflow=1
+ AC_MSG_RESULT([yes])
+ ], [
+ have_builtin_saddll_overflow=0
+ AC_MSG_RESULT([no])
+ ])
+
+ AC_DEFINE_UNQUOTED([PHP_HAVE_BUILTIN_SADDLL_OVERFLOW],
+ [$have_builtin_saddll_overflow], [Whether the compiler supports __builtin_saddll_overflow])
+
+])
+
+dnl PHP_CHECK_BUILTIN_SSUBL_OVERFLOW
+AC_DEFUN([PHP_CHECK_BUILTIN_SSUBL_OVERFLOW], [
+ AC_MSG_CHECKING([for __builtin_ssubl_overflow])
+
+ AC_TRY_LINK(, [
+ long tmpvar;
+ return __builtin_ssubl_overflow(3, 7, &tmpvar);
+ ], [
+ have_builtin_ssubl_overflow=1
+ AC_MSG_RESULT([yes])
+ ], [
+ have_builtin_ssubl_overflow=0
+ AC_MSG_RESULT([no])
+ ])
+
+ AC_DEFINE_UNQUOTED([PHP_HAVE_BUILTIN_SSUBL_OVERFLOW],
+ [$have_builtin_ssubl_overflow], [Whether the compiler supports __builtin_ssubl_overflow])
+
+])
+
+dnl PHP_CHECK_BUILTIN_SSUBLL_OVERFLOW
+AC_DEFUN([PHP_CHECK_BUILTIN_SSUBLL_OVERFLOW], [
+ AC_MSG_CHECKING([for __builtin_ssubll_overflow])
+
+ AC_TRY_LINK(, [
+ long long tmpvar;
+ return __builtin_ssubll_overflow(3, 7, &tmpvar);
+ ], [
+ have_builtin_ssubll_overflow=1
+ AC_MSG_RESULT([yes])
+ ], [
+ have_builtin_ssubll_overflow=0
+ AC_MSG_RESULT([no])
+ ])
+
+ AC_DEFINE_UNQUOTED([PHP_HAVE_BUILTIN_SSUBLL_OVERFLOW],
+ [$have_builtin_ssubll_overflow], [Whether the compiler supports __builtin_ssubll_overflow])
+
+])
+
dnl Load the AX_CHECK_COMPILE_FLAG macro from the autoconf archive.
m4_include([build/ax_check_compile_flag.m4])