diff options
| author | Nikita Popov <nikic@php.net> | 2016-09-16 21:06:11 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-09-16 21:06:11 +0200 |
| commit | cab7bc7e074ee310571815048b587915934dbb29 (patch) | |
| tree | 477d8530771af871f7e5b3b43d542d71d2db5cda /Zend/zend_operators.h | |
| parent | 12755437cbb4d2da91952bc7dc64121c2b34e74a (diff) | |
| parent | 0e76cafaf18dbbb6af609b2e765fe68fd30b8002 (diff) | |
| download | php-git-cab7bc7e074ee310571815048b587915934dbb29.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'Zend/zend_operators.h')
| -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 370502282d..4e5a98c1ab 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -520,7 +520,10 @@ static zend_always_inline void fast_long_decrement_function(zval *op1) static zend_always_inline void fast_long_add_function(zval *result, zval *op1, zval *op2) { -#if defined(__GNUC__) && defined(__i386__) && !(4 == __GNUC__ && 8 == __GNUC_MINOR__) +#if 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" @@ -606,7 +609,10 @@ static zend_always_inline int fast_add_function(zval *result, zval *op1, zval *o static zend_always_inline void fast_long_sub_function(zval *result, zval *op1, zval *op2) { -#if defined(__GNUC__) && defined(__i386__) && !(4 == __GNUC__ && 8 == __GNUC_MINOR__) +#if 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" |