Use "fastcal" calling convention for internal PHP functions on x86

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index cc6a7c361d0b434448c56734ab3edf33d0c0e66f..c05a527e6e37952e625ad0f52844ffc14058a150 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -63,7 +63,7 @@ typedef struct _zend_fcall_info_cache {
 
 #define ZEND_FN(name) zif_##name
 #define ZEND_MN(name) zim_##name
-#define ZEND_NAMED_FUNCTION(name)              void name(INTERNAL_FUNCTION_PARAMETERS)
+#define ZEND_NAMED_FUNCTION(name)              void ZEND_FASTCALL name(INTERNAL_FUNCTION_PARAMETERS)
 #define ZEND_FUNCTION(name)                            ZEND_NAMED_FUNCTION(ZEND_FN(name))
 #define ZEND_METHOD(classname, name)   ZEND_NAMED_FUNCTION(ZEND_MN(classname##_##name))
 

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 62fcdc9d8df31f53d87ea449c61242d02d4ba64b..a615cf620e4b15ff9f82e3004399080c26cdfe26 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -408,7 +408,7 @@ struct _zend_op_array {
 #define ZEND_RETURN_REFERENCE                  1
 
 /* zend_internal_function_handler */
-typedef void (*zif_handler)(INTERNAL_FUNCTION_PARAMETERS);
+typedef void ZEND_FASTCALL (*zif_handler)(INTERNAL_FUNCTION_PARAMETERS);
 
 typedef struct _zend_internal_function {
        /* Common elements */