From: Joe Watkins <krakjoe@php.net>
Date: Fri, 6 Jan 2017 16:24:10 +0000 (+0000)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~612
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb513f15e1c8006bc323fe2c641fb7aa839e7853;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  Test request47456.phpt for PR 1303
---

bb513f15e1c8006bc323fe2c641fb7aa839e7853
diff --cc acinclude.m4
index dc75c0acab,1a4ac7ce83..61de6cbacb
--- 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])