diff options
| author | Stanislav Malyshev <stas@php.net> | 2012-09-17 15:58:48 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2012-09-17 15:58:48 -0700 |
| commit | 44e3a9be7edb8ec3b8d8f6aec3fa7ea3b9abb047 (patch) | |
| tree | af06c1e94541959b5883564d603f9c839fce2008 | |
| parent | f163c70feae301ff259aca8eb0929f3a4b70a1c1 (diff) | |
| parent | d0ab22e829290b3f516b05190530e22e5a567b26 (diff) | |
| download | php-git-44e3a9be7edb8ec3b8d8f6aec3fa7ea3b9abb047.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
update news
Support building PHP with the native client toolchain.
test should fail
| -rw-r--r-- | Zend/zend_alloc.c | 6 | ||||
| -rw-r--r-- | ext/date/tests/bug62852.phpt | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index a29350d7bf..155ae88b6b 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -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) { diff --git a/ext/date/tests/bug62852.phpt b/ext/date/tests/bug62852.phpt index 2c23138035..26de510215 100644 --- a/ext/date/tests/bug62852.phpt +++ b/ext/date/tests/bug62852.phpt @@ -29,5 +29,8 @@ try { unserialize( $s2 ); } catch ( Exception $e ) {} var_dump( $foo ); + +echo "okey"; ?> --EXPECTF-- +okey |