From d54bc7556426dfb15dcf85b6e0f839955b75ab48 Mon Sep 17 00:00:00 2001
From: lingsheng <lingsheng@huawei.com>
Date: Thu, 23 Jul 2020 14:43:44 +0800
Subject: [PATCH] Don't redefine gettid if glibc provides it

---
 ...redefine-gettid-if-glibc-provides-it.patch | 38 +++++++++++++++++++
 kae.spec                                      | 10 ++++-
 2 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 0001-Don-t-redefine-gettid-if-glibc-provides-it.patch

diff --git a/0001-Don-t-redefine-gettid-if-glibc-provides-it.patch b/0001-Don-t-redefine-gettid-if-glibc-provides-it.patch
new file mode 100644
index 0000000..8611250
--- /dev/null
+++ b/0001-Don-t-redefine-gettid-if-glibc-provides-it.patch
@@ -0,0 +1,38 @@
+From 50291cc18c01a5dad9363596f038ee6e0401edfe Mon Sep 17 00:00:00 2001
+From: lingsheng <lingsheng@huawei.com>
+Date: Thu, 23 Jul 2020 14:27:36 +0800
+Subject: [PATCH] Don't redefine gettid if glibc provides it
+
+glibc 2.30+ include a definition for gettid() so that users don't have
+to manually define gettid() with syscall().
+Old code don't check this, this will redefine gettid() on the latest
+versions of glibc, causing build fail.
+
+Signed-off-by: lingsheng <lingsheng@huawei.com>
+---
+ KAE/utils/engine_utils.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/KAE/utils/engine_utils.h b/KAE/utils/engine_utils.h
+index 160e449..5e9f2b4 100644
+--- a/KAE/utils/engine_utils.h
++++ b/KAE/utils/engine_utils.h
+@@ -23,12 +23,15 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <pthread.h>
++#include <unistd.h>
+ #include <sys/file.h>
+ #include <sys/syscall.h>
+ #include <sys/types.h>
+ #include <sys/syscall.h>
+ 
++#ifndef gettid
+ #define gettid() syscall(SYS_gettid)
++#endif
+ #define PRINTPID \
+     US_DEBUG("pid=%d, ptid=%lu, tid=%d", getpid(), pthread_self(), gettid())
+ 
+-- 
+2.23.0
+
diff --git a/kae.spec b/kae.spec
index f8fab04..02ab859 100644
--- a/kae.spec
+++ b/kae.spec
@@ -3,7 +3,7 @@
 Name:          libkae
 Summary:       Huawei Kunpeng Accelerator Engine
 Version:       1.2.10
-Release:       3
+Release:       4
 License:       Apache-2.0
 Source:        %{name}-%{version}.tar.gz
 Vendor:        Huawei Corporation
@@ -16,11 +16,14 @@ Provides:      %{name} = %{version}-%{release}
 BuildRequires: libwd >= %{version} openssl-devel sed
 Requires:      openssl
 ExclusiveArch: aarch64
+
+Patch0001:     0001-Don-t-redefine-gettid-if-glibc-provides-it.patch
+
 %description
 This package contains the Huawei Kunpeng Accelerator Engine
 
 %prep
-%setup -c -n %{name}-%{version}
+%autosetup -c -n %{name}-%{version} -p1
 
 %build
 cd KAE
@@ -64,6 +67,9 @@ fi
 /sbin/ldconfig
 
 %changelog
+* Thu Jul 23 2020 lingsheng <lingsheng@huawei.com> 1.2.10-4
+- Don't redefine gettid if glibc provides it
+
 * Sun Mar 15 2020 zhangtao <zhangtao221@huawei.com> 1.2.10-3
 - Specify aarch64 compilation
 
-- 
Gitee