commit b2dbe49a3202e74b112e629f38d979e98fcfda58 Author: Elan Ruusamäe <g...@delfi.ee> Date: Fri Feb 27 18:07:31 2015 +0200
drop x32.patch, already upstream php.spec | 2 -- x32.patch | 62 -------------------------------------------------------------- 2 files changed, 64 deletions(-) --- diff --git a/php.spec b/php.spec index 15577f8..cdd2d8a 100644 --- a/php.spec +++ b/php.spec @@ -213,7 +213,6 @@ Patch63: %{orgname}-mysql-nowarning.patch Patch65: system-libzip.patch Patch66: php-db.patch Patch67: mysql-lib-ver-mismatch.patch -Patch68: x32.patch Patch69: fpm-conf-split.patch Patch70: mysqlnd-ssl.patch URL: http://www.php.net/ @@ -2068,7 +2067,6 @@ exit 1 %{?with_system_libzip:%patch65 -p1} %patch66 -p1 %patch67 -p1 -%patch68 -p1 %patch70 -p1 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4 diff --git a/x32.patch b/x32.patch deleted file mode 100644 index 4b86bb6..0000000 --- a/x32.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 514afd67b651bea834bdb84b7685b48e9e56ac21 Mon Sep 17 00:00:00 2001 -From: Gustavo Lopes <glo...@nebm.ist.utl.pt> -Date: Tue, 30 Apr 2013 19:00:31 +0200 -Subject: [PATCH] Fix bug #64729: compilation failure on x32 - ---- - Zend/zend_alloc.c | 18 ++++++++++++++---- - Zend/zend_multiply.h | 4 ++-- - 2 files changed, 16 insertions(+), 6 deletions(-) - -diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c -index 605e396..0bbd59a 100644 ---- a/Zend/zend_alloc_canary.c -+++ b/Zend/zend_alloc_canary.c -@@ -720,7 +720,7 @@ static inline unsigned int zend_mm_high_bit(size_t _size) - #elif defined(__GNUC__) && defined(__x86_64__) - unsigned long n; - -- __asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm" (_size)); -+ __asm__("bsr %1,%0\n\t" : "=r" (n) : "rm" (_size)); - return (unsigned int)n; - #elif defined(_MSC_VER) && defined(_M_IX86) - __asm { -@@ -746,12 +746,12 @@ static inline unsigned int zend_mm_low_bit(size_t _size) - #elif defined(__GNUC__) && defined(__x86_64__) - unsigned long n; - -- __asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm" (_size)); -+ __asm__("bsf %1,%0\n\t" : "=r" (n) : "rm" (_size)); - return (unsigned int)n; - #elif defined(_MSC_VER) && defined(_M_IX86) - __asm { - bsf eax, _size -- } -+ } - #else - static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0}; - unsigned int n; -@@ -2481,12 +2481,22 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) - size_t res = nmemb; - unsigned long overflow = 0; - -- __asm__ ("mulq %3\n\taddq %4,%0\n\tadcq %1,%1" -+#ifdef __ILP32__ /* x32 */ -+# define LP_SUFF "l" -+#else /* amd64 */ -+# define LP_SUFF "q" -+#endif -+ -+ __asm__ ("mul" LP_SUFF " %3\n\t" -+ "add %4,%0\n\t" -+ "adc %1,%1" - : "=&a"(res), "=&d" (overflow) - : "%0"(res), - "rm"(size), - "rm"(offset)); - -+#undef LP_SUFF -+ - if (UNEXPECTED(overflow)) { - zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset); - return 0; ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/b2dbe49a3202e74b112e629f38d979e98fcfda58 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit