Permalink
Browse files

Merge branch 'PHP-5.4'

* PHP-5.4:
  update news
  Support building PHP with the native client toolchain.
  test should fail
  • Loading branch information...
2 parents f163c70 + d0ab22e commit 44e3a9be7edb8ec3b8d8f6aec3fa7ea3b9abb047 @smalyshev smalyshev committed Sep 17, 2012
Showing with 6 additions and 3 deletions.
  1. +3 −3 Zend/zend_alloc.c
  2. +3 −0 ext/date/tests/bug62852.phpt
View
@@ -664,7 +664,7 @@ static void *_zend_mm_realloc_int(zend_mm_heap *heap, void *p, size_t size ZEND_
static inline unsigned int zend_mm_high_bit(size_t _size)
{
-#if defined(__GNUC__) && defined(i386)
+#if defined(__GNUC__) && (defined(__native_client__) || defined(i386))
unsigned int n;
__asm__("bsrl %1,%0\n\t" : "=r" (n) : "rm" (_size));
@@ -690,7 +690,7 @@ static inline unsigned int zend_mm_high_bit(size_t _size)
static inline unsigned int zend_mm_low_bit(size_t _size)
{
-#if defined(__GNUC__) && defined(i386)
+#if defined(__GNUC__) && (defined(__native_client__) || defined(i386))
unsigned int n;
__asm__("bsfl %1,%0\n\t" : "=r" (n) : "rm" (_size));
@@ -2454,7 +2454,7 @@ ZEND_API size_t _zend_mem_block_size(void *ptr TSRMLS_DC ZEND_FILE_LINE_DC ZEND_
return _zend_mm_block_size(AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
}
-#if defined(__GNUC__) && defined(i386)
+#if defined(__GNUC__) && (defined(__native_client__) || defined(i386))
static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
{
@@ -29,5 +29,8 @@ try {
unserialize( $s2 );
} catch ( Exception $e ) {}
var_dump( $foo );
+
+echo "okey";
?>
--EXPECTF--
+okey

0 comments on commit 44e3a9b

Please sign in to comment.