com php-src: Suppressed warning -Wvolatile-register-var: Zend/zend_vm_execute.h Zend/zend_vm_gen.php

Commit: 517c59bfcb6f94d606f0bce74f491035c14ada27 Author: Xinchen Hui <laruence@gmail.com> Tue, 15 Sep 2015 08:23:21 -0700 Parents: e841016df727896342310b579f93dfc55b931caf Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=517c59bfcb6f94d606f0bce74f491035c14ada27 Log: Suppressed warning -Wvolatile-register-var Changed paths: M Zend/zend_vm_execute.h M Zend/zend_vm_gen.php Diff: diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index a717262..83e82c8 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -311,11 +311,15 @@ static const void *zend_vm_get_opcode_handler(zend_uchar opcode, const zend_op* #ifdef ZEND_VM_FP_GLOBAL_REG +#pragma GCC diagnostic ignored "-Wvolatile-register-var" register zend_execute_data* volatile execute_data __asm__(ZEND_VM_FP_GLOBAL_REG); +#pragma GCC diagnostic warning "-Wvolatile-register-var" #endif #ifdef ZEND_VM_IP_GLOBAL_REG +#pragma GCC diagnostic ignored "-Wvolatile-register-var" register const zend_op* volatile opline __asm__(ZEND_VM_IP_GLOBAL_REG); +#pragma GCC diagnostic warning "-Wvolatile-register-var" #endif #ifdef ZEND_VM_FP_GLOBAL_REG diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php index 40c9f24..8f06bb4 100644 --- a/Zend/zend_vm_gen.php +++ b/Zend/zend_vm_gen.php @@ -1032,11 +1032,15 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name) case ZEND_VM_KIND_CALL: out($f,"\n"); out($f,"#ifdef ZEND_VM_FP_GLOBAL_REG\n"); + out($f,"#pragma GCC diagnostic ignored \"-Wvolatile-register-var\"\n"); out($f,"register zend_execute_data* volatile execute_data __asm__(ZEND_VM_FP_GLOBAL_REG);\n"); + out($f,"#pragma GCC diagnostic warning \"-Wvolatile-register-var\"\n"); out($f,"#endif\n"); out($f,"\n"); out($f,"#ifdef ZEND_VM_IP_GLOBAL_REG\n"); + out($f,"#pragma GCC diagnostic ignored \"-Wvolatile-register-var\"\n"); out($f,"register const zend_op* volatile opline __asm__(ZEND_VM_IP_GLOBAL_REG);\n"); + out($f,"#pragma GCC diagnostic warning \"-Wvolatile-register-var\"\n"); out($f,"#endif\n"); out($f,"\n"); out($f,"#ifdef ZEND_VM_FP_GLOBAL_REG\n");