Skip to content

Commit 24388fd

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Changed PowerPC CPU registers used by Zend VM to work around GCC bug.
2 parents a6dd92f + e0996de commit 24388fd

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Zend/zend_execute.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@
5454
# define ZEND_VM_FP_GLOBAL_REG "%r14"
5555
# define ZEND_VM_IP_GLOBAL_REG "%r15"
5656
# elif defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(__powerpc64__)
57-
# define ZEND_VM_FP_GLOBAL_REG "r28"
58-
# define ZEND_VM_IP_GLOBAL_REG "r29"
57+
# define ZEND_VM_FP_GLOBAL_REG "r14"
58+
# define ZEND_VM_IP_GLOBAL_REG "r15"
5959
# elif defined(__IBMC__) && ZEND_GCC_VERSION >= 4002 && defined(__powerpc64__)
60-
# define ZEND_VM_FP_GLOBAL_REG "r28"
61-
# define ZEND_VM_IP_GLOBAL_REG "r29"
60+
# define ZEND_VM_FP_GLOBAL_REG "r14"
61+
# define ZEND_VM_IP_GLOBAL_REG "r15"
6262
# elif defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(__aarch64__)
6363
# define ZEND_VM_FP_GLOBAL_REG "x27"
6464
# define ZEND_VM_IP_GLOBAL_REG "x28"

0 commit comments

Comments
 (0)