From 6b1164efae03f35edd3ec02468be652e0265bafc Mon Sep 17 00:00:00 2001 From: wzx Date: Tue, 1 Nov 2022 14:36:48 +0800 Subject: [PATCH] Add sw64 architecture Signed-off-by: wzx (cherry picked from commit 071ebcbc5920ca4128a37e36c16885097ec80a7f) --- php-Add-sw64-architecture.patch | 58 +++++++++++++++++++++++++++++++++ php.spec | 6 +++- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 php-Add-sw64-architecture.patch diff --git a/php-Add-sw64-architecture.patch b/php-Add-sw64-architecture.patch new file mode 100644 index 0000000..8444922 --- /dev/null +++ b/php-Add-sw64-architecture.patch @@ -0,0 +1,58 @@ +From 635857831767f2bdf33af26fda521681380cede7 Mon Sep 17 00:00:00 2001 +From: wzx +Date: Tue, 25 Oct 2022 16:15:28 +0800 +Subject: [PATCH] Add sw64 architecture + +Add sw64 architecture in file configure.ac brg_endian.h and crypt_blowfish.c to support sw64 architecture. + +Signed-off-by: wzx +--- + configure.ac | 3 +++ + ext/hash/sha3/generic64lc/brg_endian.h | 3 ++- + ext/standard/crypt_blowfish.c | 2 +- + 5 files changed, 15 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 92464a7d..1f1f2af5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -193,6 +193,9 @@ dnl ---------------------------------------------------------------------------- + + dnl See bug #28605 + case $host_cpu in ++ sw_64*) ++ CFLAGS="$CFLAGS -mieee" ++ ;; + alpha*) + if test "$GCC" = "yes"; then + CFLAGS="$CFLAGS -mieee" +diff --git a/ext/hash/sha3/generic64lc/brg_endian.h b/ext/hash/sha3/generic64lc/brg_endian.h +index 7226eb3b..6c6bd823 100644 +--- a/ext/hash/sha3/generic64lc/brg_endian.h ++++ b/ext/hash/sha3/generic64lc/brg_endian.h +@@ -111,7 +111,8 @@ + defined( __i386__ ) || defined( _M_I86 ) || defined( _M_IX86 ) || \ + defined( __OS2__ ) || defined( sun386 ) || defined( __TURBOC__ ) || \ + defined( vax ) || defined( vms ) || defined( VMS ) || \ +- defined( __VMS ) || defined( _M_X64 ) ++ defined( __VMS ) || defined( _M_X64 ) || \ ++ defined( __sw_64__ ) || defined( __sw_64 ) + # define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN + + #elif defined( AMIGA ) || defined( applec ) || defined( __AS400__ ) || \ +diff --git a/ext/standard/crypt_blowfish.c b/ext/standard/crypt_blowfish.c +index 3806a290..9a4aba34 100644 +--- a/ext/standard/crypt_blowfish.c ++++ b/ext/standard/crypt_blowfish.c +@@ -53,7 +53,7 @@ + /* Just to make sure the prototypes match the actual definitions */ + #include "crypt_blowfish.h" + +-#if defined(__i386__) || defined(__x86_64__) || defined(__alpha__) || defined(__hppa__) ++#if defined(__i386__) || defined(__x86_64__) || defined(__alpha__) || defined(__sw_64__) || defined(__hppa__) + #define BF_SCALE 1 + #else + #define BF_SCALE 0 +-- +2.33.0 + diff --git a/php.spec b/php.spec index 53b1bee..4c8a96b 100644 --- a/php.spec +++ b/php.spec @@ -26,7 +26,7 @@ Name: php Version: %{upver} -Release: 1 +Release: 2 Summary: PHP scripting language for creating dynamic web sites License: PHP-3.01 and Zend-2.0 and BSD and MIT and ASL 1.0 and NCSA URL: http://www.php.net/ @@ -55,6 +55,7 @@ Patch4: php-7.4.0-phpize.patch Patch5: php-7.4.0-ldap_r.patch Patch6: php-8.0.0-phpinfo.patch Patch7: php-7.4.0-datetests.patch +Patch8: php-Add-sw64-architecture.patch BuildRequires: bzip2-devel, curl-devel >= 7.9, httpd-devel >= 2.0.46-1, pam-devel, httpd-filesystem, nginx-filesystem BuildRequires: libstdc++-devel, openssl-devel, sqlite-devel >= 3.6.0, zlib-devel, smtpdaemon, libedit-devel @@ -1086,6 +1087,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %changelog +* Tue Nov 1 2022 wuzx - 8.0.25-2 +- Add sw64 architecture + * Sat Oct 29 2022 Funda Wang - 8.0.25-1 - New version 8.0.25 -- Gitee