com php-src: Support for XLC compiler: Zend/Zend.m4 Zend/zend_execute.c
| From: | Anatol Belski | Date: | Mon, 10 Aug 2015 16:12:11 +0000 |
| Subject: | com php-src: Support for XLC compiler: Zend/Zend.m4 Zend/zend_execute.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88613@lists.php.net to get a copy of this message | ||
Commit: 97f159d70288ae94f9a05a370121bcbea760ed9a
Author: Dmitry Stogov <dmitry@zend.com> Mon, 10 Aug 2015 19:12:11 +0300
Parents: 4b90d63b57f10ba360004eaf5596960087da6e22
Branches: PHP-7.0.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=97f159d70288ae94f9a05a370121bcbea760ed9a
Log:
Support for XLC compiler
Changed paths:
M Zend/Zend.m4
M Zend/zend_execute.c
Diff:
diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index 6104dc0..bdeac67 100644
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -421,7 +421,6 @@ AC_ARG_ENABLE(gcc-global-regs,
AC_MSG_CHECKING(for global register variables support)
if test "$ZEND_GCC_GLOBAL_REGS" != "no"; then
AC_TRY_COMPILE([
- ],[
#if defined(__GNUC__)
# define ZEND_GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
#else
@@ -436,6 +435,9 @@ if test "$ZEND_GCC_GLOBAL_REGS" != "no"; then
#elif defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(__powerpc64__)
# define ZEND_VM_FP_GLOBAL_REG "r28"
# define ZEND_VM_IP_GLOBAL_REG "r29"
+#elif defined(__IBMC__) && ZEND_GCC_VERSION >= 4002 && defined(__powerpc64__)
+# define ZEND_VM_FP_GLOBAL_REG "r28"
+# define ZEND_VM_IP_GLOBAL_REG "r29"
#else
# error "global register variables are not supported"
#endif
@@ -452,6 +454,7 @@ int emu(const opcode_handler_t *ip, void *fp) {
IP = orig_ip;
}
], [
+ ], [
ZEND_GCC_GLOBAL_REGS=yes
], [
ZEND_GCC_GLOBAL_REGS=no
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 0909656..ad94634 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2553,6 +2553,9 @@ void zend_cleanup_unfinished_execution(zend_execute_data *execute_data,
uint32_t
# elif defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(__powerpc64__)
# define ZEND_VM_FP_GLOBAL_REG "r28"
# define ZEND_VM_IP_GLOBAL_REG "r29"
+# elif defined(__IBMC__) && ZEND_GCC_VERSION >= 4002 && defined(__powerpc64__)
+# define ZEND_VM_FP_GLOBAL_REG "r28"
+# define ZEND_VM_IP_GLOBAL_REG "r29"
# endif
#endif