diff options
| author | Nikita Popov <nikic@php.net> | 2016-09-16 21:06:52 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-09-16 21:06:52 +0200 |
| commit | dd7affa9ff98e8c84bb8446ed379df9598a8348d (patch) | |
| tree | 71a282fac81bdaae55d7439be0ba3e47850de3bf | |
| parent | bc61ba1133c99eb10d8e562a7344e184d9704dae (diff) | |
| parent | cab7bc7e074ee310571815048b587915934dbb29 (diff) | |
| download | php-git-dd7affa9ff98e8c84bb8446ed379df9598a8348d.tar.gz | |
Merge branch 'PHP-7.1'
| -rw-r--r-- | Zend/zend_operators.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index ca772c0de0..2525ebca2b 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -563,7 +563,10 @@ static zend_always_inline void fast_long_add_function(zval *result, zval *op1, z } else { ZVAL_LONG(result, llresult); } -#elif defined(__GNUC__) && defined(__i386__) && !(4 == __GNUC__ && 8 == __GNUC_MINOR__) +#elif defined(__GNUC__) && defined(__i386__) \ + && !(4 == __GNUC__ && 8 == __GNUC_MINOR__) \ + && !(4 == __GNUC__ && 9 == __GNUC_MINOR__ && (defined(__PIC__) || defined(__PIE__))) + /* Position-independent builds fail with gcc-4.9.x */ __asm__( "movl (%1), %%eax\n\t" "addl (%2), %%eax\n\t" @@ -663,7 +666,10 @@ static zend_always_inline void fast_long_sub_function(zval *result, zval *op1, z } else { ZVAL_LONG(result, llresult); } -#elif defined(__GNUC__) && defined(__i386__) && !(4 == __GNUC__ && 8 == __GNUC_MINOR__) +#elif defined(__GNUC__) && defined(__i386__) && \ + !(4 == __GNUC__ && 8 == __GNUC_MINOR__) && \ + !(4 == __GNUC__ && 9 == __GNUC_MINOR__ && (defined(__PIC__) || defined(__PIE__))) + /* Position-independent builds fail with gcc-4.9.x */ __asm__( "movl (%1), %%eax\n\t" "subl (%2), %%eax\n\t" |