From 4accdfac4abc3e5ec6c18277ebaeef4667465f98 Mon Sep 17 00:00:00 2001 From: Kemeng Shi Date: Sat, 17 Dec 2022 00:11:22 +0800 Subject: [PATCH] =?UTF-8?q?[sync]=20PR-32=EF=BC=9A=E6=B7=BB=E5=8A=A0sw?= =?UTF-8?q?=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mariadb-connector-c-3.1.13-src-sw.patch | 20 ++++++++++++++++++++ mariadb-connector-c.spec | 6 +++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 mariadb-connector-c-3.1.13-src-sw.patch diff --git a/mariadb-connector-c-3.1.13-src-sw.patch b/mariadb-connector-c-3.1.13-src-sw.patch new file mode 100644 index 0000000..c929557 --- /dev/null +++ b/mariadb-connector-c-3.1.13-src-sw.patch @@ -0,0 +1,20 @@ +diff -Naur mariadb-connector-c-3.1.13-src.org/include/ma_global.h mariadb-connector-c-3.1.13-src.sw/include/ma_global.h +--- mariadb-connector-c-3.1.13-src.org/include/ma_global.h 2021-11-23 11:22:25.760000000 +0000 ++++ mariadb-connector-c-3.1.13-src.sw/include/ma_global.h 2021-11-23 11:23:38.230000000 +0000 +@@ -137,6 +137,16 @@ + #define FIX_GCC_LINKING_PROBLEM + #endif + ++/* egcs 1.1.2 has a problem with memcpy on Sw_64 */ ++#if defined(__GNUC__) && defined(__sw_64__) && ! (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)) ++#define BAD_MEMCPY ++#endif ++ ++/* In Linux-sw_64 we have atomic.h if we are using gcc */ ++#if defined(HAVE_LINUXTHREADS) && defined(__GNUC__) && defined(__sw_64__) && (__GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 95)) && !defined(HAVE_ATOMIC_ADD) ++#define HAVE_ATOMIC_ADD ++#define HAVE_ATOMIC_SUB ++#endif + /* egcs 1.1.2 has a problem with memcpy on Alpha */ + #if defined(__GNUC__) && defined(__alpha__) && ! (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)) + #define BAD_MEMCPY diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 0377366..6e3356d 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -1,6 +1,6 @@ Name: mariadb-connector-c Version: 3.1.13 -Release: 3 +Release: 4 Summary: MariaDB connector library in C License: LGPLv2+ URL: https://github.com/MariaDB/mariadb-connector-c @@ -13,6 +13,7 @@ Obsoletes: %{name}-config Patch0001: 0001-CVE-2022-37434.patch Patch0002: 0002-CVE-2022-37434.patch +Patch0003: mariadb-connector-c-3.1.13-src-sw.patch %description This package is used for connecting C/C++ programs to MariaDB and @@ -99,6 +100,9 @@ end %endif %changelog +* Fri Dec 16 2022 wuzx - 3.1.13-4 +- Add sw64 architecture + * Mon Nov 14 2022 zhaozhen - 3.1.13-3 - Add loongarch support