svn: /php/php-src/ branches/PHP_5_3/sapi/fpm/fpm/fpm_atomic.h trunk/sapi/fpm/fpm/fpm_atomic.h
| From: | Jérôme Loyet | Date: | Tue, 16 Nov 2010 22:02:36 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/sapi/fpm/fpm/fpm_atomic.h trunk/sapi/fpm/fpm/fpm_atomic.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-63854@lists.php.net to get a copy of this message | ||
fat Tue, 16 Nov 2010 22:02:36 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=305417
Log:
- Fixed #53310 (sparc < v9 won't is not supported)
Bug: http://bugs.php.net/53310 (Analyzed) fpm_atomic.h uses
SPARC v9 only code, doesn't work on v8
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_atomic.h
U php/php-src/trunk/sapi/fpm/fpm/fpm_atomic.h
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_atomic.h
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_atomic.h 2010-11-16 21:02:14 UTC (rev 305416)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_atomic.h 2010-11-16 22:02:36 UTC (rev 305417)
@@ -95,6 +95,8 @@
#elif ( __sparc__ || __sparc ) /* Marcin Ochab */
+#if (__sparcv9 || __sparcv9__)
+
#if (__arch64__ || __arch64)
typedef uint64_t atomic_uint_t;
typedef volatile atomic_uint_t atomic_t;
@@ -131,9 +133,13 @@
/* }}} */
#endif
+#else /* #if (__sparcv9 || __sparcv9__) */
+#error Sparc v8 and predecessors are not and will not be supported (see bug report 53310)
+#endif /* #if (__sparcv9 || __sparcv9__) */
+
#else
-#error unsupported processor. please write a patch and send it to me
+#error Unsupported processor. Please open a bug report (bugs.php.net).
#endif
Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_atomic.h
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_atomic.h 2010-11-16 21:02:14 UTC (rev 305416)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_atomic.h 2010-11-16 22:02:36 UTC (rev 305417)
@@ -95,6 +95,8 @@
#elif ( __sparc__ || __sparc ) /* Marcin Ochab */
+#if (__sparcv9 || __sparcv9__)
+
#if (__arch64__ || __arch64)
typedef uint64_t atomic_uint_t;
typedef volatile atomic_uint_t atomic_t;
@@ -131,9 +133,13 @@
/* }}} */
#endif
+#else /* #if (__sparcv9 || __sparcv9__) */
+#error Sparc v8 and predecessors are not and will not be supported (see bug report 53310)
+#endif /* #if (__sparcv9 || __sparcv9__) */
+
#else
-#error unsupported processor. please write a patch and send it to me
+#error Unsupported processor. Please open a bug report (bugs.php.net).
#endif