From 0e76cafaf18dbbb6af609b2e765fe68fd30b8002 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Fri, 16 Sep 2016 21:03:01 +0200 Subject: [PATCH] Disable add/sub asm for gcc 4.9 pic/pie builds --- Zend/zend_operators.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index f0ad0300fba..a08b49c30f0 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -510,7 +510,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" @@ -596,7 +599,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"