diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-04-22 14:29:58 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-04-22 14:29:58 +0300 |
| commit | 4d7df449d0ab389b01b45fa1bb9bf2b4a8755545 (patch) | |
| tree | 3ec19f86a48faa3f057f54f77a90bdd9d4b20116 | |
| parent | b8e0f506b536b2864224f97ae804d69039ccfb3d (diff) | |
| parent | 9df15fc26b7c09178365a26470ed8fb4a5c2c036 (diff) | |
| download | php-git-4d7df449d0ab389b01b45fa1bb9bf2b4a8755545.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Add gcc global register for aarch64
| -rw-r--r-- | Zend/Zend.m4 | 3 | ||||
| -rw-r--r-- | Zend/zend_execute.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index a44a59bfc2..71c602b5f0 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -362,6 +362,9 @@ if test "$ZEND_GCC_GLOBAL_REGS" != "no"; then #elif defined(__IBMC__) && ZEND_GCC_VERSION >= 4002 && defined(__powerpc64__) # define ZEND_VM_FP_GLOBAL_REG "r28" # define ZEND_VM_IP_GLOBAL_REG "r29" +#elif defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(__aarch64__) +# define ZEND_VM_FP_GLOBAL_REG "x27" +# define ZEND_VM_IP_GLOBAL_REG "x28" #else # error "global register variables are not supported" #endif diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 7148957a6c..75169cafeb 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -56,6 +56,9 @@ # elif defined(__IBMC__) && ZEND_GCC_VERSION >= 4002 && defined(__powerpc64__) # define ZEND_VM_FP_GLOBAL_REG "r28" # define ZEND_VM_IP_GLOBAL_REG "r29" +# elif defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(__aarch64__) +# define ZEND_VM_FP_GLOBAL_REG "x27" +# define ZEND_VM_IP_GLOBAL_REG "x28" # endif #endif |