svn: /php/php-src/ branches/PHP_5_4/Zend/zend_operators.h trunk/Zend/zend_operators.h
| From: | Gwynne Raskind | Date: | Sun, 07 Aug 2011 16:31:21 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_4/Zend/zend_operators.h trunk/Zend/zend_operators.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65757@lists.php.net to get a copy of this message | ||
gwynne Sun, 07 Aug 2011 16:31:21 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=314439
Log:
For 5.4, fix C++-style comments. For trunk, forward-port build fix.
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_operators.h
U php/php-src/trunk/Zend/zend_operators.h
Modified: php/php-src/branches/PHP_5_4/Zend/zend_operators.h
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_operators.h 2011-08-07 16:10:34 UTC (rev 314438)
+++ php/php-src/branches/PHP_5_4/Zend/zend_operators.h 2011-08-07 16:31:21 UTC (rev 314439)
@@ -616,7 +616,7 @@
"fildl (%2)\n\t"
"fildl (%1)\n\t"
#if defined(__clang__) && (__clang_major__ < 2 || (__clang_major__ == 2 &&
__clang_minor__ < 10))
- "fsubp %%st(1), %%st\n\t" // LLVM bug #9164
+ "fsubp %%st(1), %%st\n\t" /* LLVM bug #9164 */
#else
"fsubp %%st, %%st(1)\n\t"
#endif
@@ -640,7 +640,7 @@
"fildq (%2)\n\t"
"fildq (%1)\n\t"
#if defined(__clang__) && (__clang_major__ < 2 || (__clang_major__ == 2 &&
__clang_minor__ < 10))
- "fsubp %%st(1), %%st\n\t" // LLVM bug #9164
+ "fsubp %%st(1), %%st\n\t" /* LLVM bug #9164 */
#else
"fsubp %%st, %%st(1)\n\t"
#endif
Modified: php/php-src/trunk/Zend/zend_operators.h
===================================================================
--- php/php-src/trunk/Zend/zend_operators.h 2011-08-07 16:10:34 UTC (rev 314438)
+++ php/php-src/trunk/Zend/zend_operators.h 2011-08-07 16:31:21 UTC (rev 314439)
@@ -615,7 +615,11 @@
"0:\n\t"
"fildl (%2)\n\t"
"fildl (%1)\n\t"
+#if defined(__clang__) && (__clang_major__ < 2 || (__clang_major__ == 2 &&
__clang_minor__ < 10))
+ "fsubp %%st(1), %%st\n\t" /* LLVM bug #9164 */
+#else
"fsubp %%st, %%st(1)\n\t"
+#endif
"movb $0x2,0xc(%0)\n\t"
"fstpl (%0)\n"
"1:"
@@ -635,7 +639,11 @@
"0:\n\t"
"fildq (%2)\n\t"
"fildq (%1)\n\t"
+#if defined(__clang__) && (__clang_major__ < 2 || (__clang_major__ == 2 &&
__clang_minor__ < 10))
+ "fsubp %%st(1), %%st\n\t" /* LLVM bug #9164 */
+#else
"fsubp %%st, %%st(1)\n\t"
+#endif
"movb $0x2,0x14(%0)\n\t"
"fstpl (%0)\n"
"1:"