!6 fix failure caused by GCC upgrade to GCC-10

From: @aslfjk
Reviewed-by: @yanan-rock
Signed-off-by: @yanan-rock,@yanan-rock

adjust-base-cflags.patch

@@ -1,7 +1,8 @@
-diff -uprN psm-3.3_raw/buildflags.mak psm-3.3/buildflags.mak
---- psm-3.3_raw/buildflags.mak	2014-08-21 04:00:18.000000000 +0800
-+++ psm-3.3/buildflags.mak	2020-03-13 21:37:04.912463946 +0800
-@@ -94,7 +94,8 @@ ifeq (1,${PSM_USE_SYS_UUID})
+diff --git a/buildflags.mak b/buildflags.mak.old
+index 34fdf1c..2c229cb 100644
+--- a/buildflags.mak
++++ b/buildflags.mak.old
+@@ -94,5 +94,6 @@ ifeq (1,${PSM_USE_SYS_UUID})
  endif
  
  CFLAGS += $(BASECFLAGS) $(if $(filter $(CC),gcc),-Wno-strict-aliasing) \
@@ -9,5 +10,3 @@ diff -uprN psm-3.3_raw/buildflags.mak psm-3.3/buildflags.mak
 +	$(if $(PSM_VALGRIND:0=),-DPSM_VALGRIND,-DNVALGRIND) \
 +	-Wno-maybe-uninitialized -Wno-implicit-function-declaration
  
- .DEFAULT_GOAL := all
- # Dummy install rule for sub-directories that don't install anything

fix-stringop-truncation-build-error.patch

@@ -0,0 +1,13 @@
+diff -Naur psm-4abbc60/psm_ep.c psm-4abbc60-edit/psm_ep.c
+--- psm-4abbc60/psm_ep.c	2020-07-02 14:18:23.738500086 +0800
++++ psm-4abbc60-edit/psm_ep.c	2020-07-02 14:22:39.097969891 +0800
+@@ -1349,8 +1349,7 @@
+ 
+     b_new = (char *) devstr;
+     e = b_new + len;
+-    strncpy(e, devstring, len-1);
+-    e[len-1] = '\0';
++    strncpy(e, devstring, len);
+     ee = e + len;
+     i = 0;
+     while (e < ee && *e && i < PTL_MAX_INIT) {

infinipath-psm.spec

@@ -1,12 +1,12 @@
 Name:           infinipath-psm
 Version:        3.3
-Release:        7
+Release:        12
 License:        GPLv2 or BSD
 Summary:        Libraries for Intel Performance Scaled Messaging
 URL:            https://github.com/01org/psm
-Source0:        https://github.com/intel/psm/archive/v3.3.tar.gz
+Source0:        https://codeload.github.com/intel/psm/zip/4abbc60
 ExclusiveArch:  x86_64
-BuildRequires:  libuuid-devel
+BuildRequires:  libuuid-devel gcc
 Obsoletes:      infinipath-libs <= %{version}-%{release}
 Requires:       udev
 Requires(post):   /sbin/ldconfig
@@ -25,6 +25,10 @@ Patch0004:      0001-Include-sysmacros.h.patch
 Patch0005:      0001-Extend-buffer-for-uvalue-and-pvalue.patch
 # Extend fdesc array
 Patch0006:      extend-fdesc-array.patch
+# Fix stringop-truncation build error
+Patch0007:      fix-stringop-truncation-build-error.patch
+# Fix multiple definitions build error
+Patch0008:      psm-multiple-definition.patch
 
 %description
 PSM API is Intel's low-level user-level communications interface for the True Scale family of products.
@@ -42,15 +46,15 @@ Requires(postun): /sbin/ldconfig
 Development files for Intel PSM.
 
 %prep
-%autosetup -n psm-%{version} -p1
+%autosetup -n psm-4abbc60 -p1
 find libuuid -type f -not -name 'psm_uuid.[c|h]' -not -name Makefile -exec rm -f '{}' \;
 
 %build
 %{set_build_flags}
-%make_build PSM_USE_SYS_UUID=1 %{PSM_HAVE_SCIF=0 MIC=0} CC=gcc
+%make_build PSM_USE_SYS_UUID=1 PSM_HAVE_SCIF=0 MIC=0 CC=gcc
 
 %install
-%make_install %{PSM_HAVE_SCIF=0 MIC=0}
+%make_install PSM_HAVE_SCIF=0 MIC=0
 install -d %{buildroot}%{_sysconfdir}/udev/rules.d
 install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/udev/rules.d/60-ipath.rules
 
@@ -76,5 +80,20 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/udev/rules.d/60-ipath.rule
 %{_includedir}/{psm.h,psm_mq.h}
 
 %changelog
+* Mon Aug 02 2021 wangyong <wangyong187@huawei.com> - 3.3-12
+- Fix build error caused by GCC upgrade to GCC-10
+
+* Mon May 31 2021 huanghaitao <huanghaitao8@huawei.com> - 3.3-11
+- Completing build dependencies
+
+* Thu Jul 02 2020 senlin <xiasenlin1@huawei.com> - 3.3-10
+- Fix stringop-truncation build error
+
+* Mon Mar 16 2020 Ling Yang <lingyang2@huawei.com> - 3.3-9
+- Fixed URL
+
+* Mon Mar 16 2020 Ling Yang <lingyang2@huawei.com> - 3.3-8
+- Fixed build error
+
 * Fri Mar 13 2020 Ling Yang <lingyang2@huawei.com> - 3.3-7
 - Package Init

misleading-indentation.patch

@@ -1,7 +1,8 @@
-diff -uprN psm-3.3_raw/psm_diags.c psm-3.3/psm_diags.c
---- psm-3.3_raw/psm_diags.c	2014-08-21 04:00:18.000000000 +0800
-+++ psm-3.3/psm_diags.c	2020-03-13 21:35:28.340564067 +0800
-@@ -280,10 +280,11 @@ memcpy_check_size (memcpy_fn_t fn, int *
+diff --git a/psm_diags.c b/psm_diags.c
+index 3e2df9d..3714cea 100644
+--- a/psm_diags.c
++++ b/psm_diags.c
+@@ -281,10 +281,11 @@ memcpy_check_size (memcpy_fn_t fn, int *p, int *f, size_t n)
    if (USE_MALLOC) {
      src = psmi_malloc(PSMI_EP_NONE, UNDEFINED, size);
      dst = psmi_malloc(PSMI_EP_NONE, UNDEFINED, size);
@@ -13,4 +14,4 @@ diff -uprN psm-3.3_raw/psm_diags.c psm-3.3/psm_diags.c
 +    }
    }
    else {
-     void *src_p, *dst_p;
+     void *src_p = NULL, *dst_p = NULL;

psm-multiple-definition.patch

@@ -0,0 +1,94 @@
+diff --git a/psm_error.h b/psm_error.h
+index 21f5745..886da89 100644
+--- a/psm_error.h
++++ b/psm_error.h
+@@ -42,7 +42,7 @@
+ #define PSMI_EP_NORETURN	    ((psm_ep_t) -2)
+ #define PSMI_EP_LOGEVENT	    ((psm_ep_t) -3)
+ 
+-psm_ep_errhandler_t psmi_errhandler_global;
++extern psm_ep_errhandler_t psmi_errhandler_global;
+ 
+ psm_error_t psmi_handle_error(psm_ep_t ep, psm_error_t error, 
+ 			      const char *buf, ...)
+diff --git a/psm_user.h b/psm_user.h
+index c9aadcc..f9a115e 100644
+--- a/psm_user.h
++++ b/psm_user.h
+@@ -100,7 +100,7 @@ psm_error_t psmi_mq_wait_internal(psm_mq_req_t *ireq);
+ #endif
+ 
+ #ifdef PSMI_PLOCK_IS_SPINLOCK
+-  psmi_spinlock_t  psmi_progress_lock;
++  extern psmi_spinlock_t  psmi_progress_lock;
+   #define PSMI_PLOCK_INIT()   psmi_spin_init(&psmi_progress_lock)
+   #define PSMI_PLOCK_TRY()    psmi_spin_trylock(&psmi_progress_lock)
+   #define PSMI_PLOCK()	      psmi_spin_lock(&psmi_progress_lock)
+@@ -109,7 +109,7 @@ psm_error_t psmi_mq_wait_internal(psm_mq_req_t *ireq);
+   #define PSMI_PUNLOCK_ASSERT()
+   #define PSMI_PLOCK_DISABLED  0
+ #elif defined(PSMI_PLOCK_IS_MUTEXLOCK_DEBUG) 
+-  pthread_mutex_t  psmi_progress_lock;
++  extern pthread_mutex_t  psmi_progress_lock;
+   pthread_t	   psmi_progress_lock_owner;
+   #define PSMI_PLOCK_NO_OWNER	((pthread_t)(-1))
+ 
+@@ -156,7 +156,7 @@ psm_error_t psmi_mq_wait_internal(psm_mq_req_t *ireq);
+ 
+   #define PSMI_PLOCK_DISABLED  0
+ #elif defined (PSMI_PLOCK_IS_MUTEXLOCK)
+-  pthread_mutex_t  psmi_progress_lock;
++  extern pthread_mutex_t  psmi_progress_lock;
+   #define PSMI_PLOCK_INIT()   /* static initialization */
+   #define PSMI_PLOCK_TRY()    pthread_mutex_trylock(&psmi_progress_lock)
+   #define PSMI_PLOCK()	      pthread_mutex_lock(&psmi_progress_lock)
+diff --git a/psm_utils.h b/psm_utils.h
+index e6420e0..6c2c5c3 100644
+--- a/psm_utils.h
++++ b/psm_utils.h
+@@ -254,7 +254,7 @@ int	psmi_diags(void);
+  * Fault injection
+  */
+ struct psmi_faultinj_spec;
+-int    psmi_faultinj_enabled; /* use macro to test */
++extern int    psmi_faultinj_enabled; /* use macro to test */
+ #if 1 /* possible to disable at compile time */
+ #define PSMI_FAULTINJ_ENABLED()	(!!psmi_faultinj_enabled)
+ #else
+diff --git a/ptl_am/ptl_fwd.h b/ptl_am/ptl_fwd.h
+index 3be8f5b..bfb2715 100644
+--- a/ptl_am/ptl_fwd.h
++++ b/ptl_am/ptl_fwd.h
+@@ -47,7 +47,7 @@
+ #endif
+ 
+ /* Symbol in am ptl */
+-struct ptl_ctl_init psmi_ptl_amsh;
++extern struct ptl_ctl_init psmi_ptl_amsh;
+ 
+ /* Special non-ptl function exposed to pre-attach to shm segment */
+ psm_error_t psmi_shm_attach(psm_ep_t ep, int *shmidx_o);
+diff --git a/ptl_ips/ptl_fwd.h b/ptl_ips/ptl_fwd.h
+index 08d4c53..5e9cd47 100644
+--- a/ptl_ips/ptl_fwd.h
++++ b/ptl_ips/ptl_fwd.h
+@@ -38,5 +38,5 @@
+ typedef struct ptl_epaddr ips_epaddr_t;
+ 
+ /* Symbol in ips ptl */
+-struct ptl_ctl_init psmi_ptl_ips;
++extern struct ptl_ctl_init psmi_ptl_ips;
+ #endif /* _PTL_FWD_IPS_H */
+diff --git a/ptl_self/ptl_fwd.h b/ptl_self/ptl_fwd.h
+index ff79c7e..32f9041 100644
+--- a/ptl_self/ptl_fwd.h
++++ b/ptl_self/ptl_fwd.h
+@@ -35,7 +35,7 @@
+ #define _PTL_FWD_SELF_H
+ 
+ /* Symbol in am ptl */
+-struct ptl_ctl_init psmi_ptl_self;
++extern struct ptl_ctl_init psmi_ptl_self;
+ 
+ #endif
+