Issue #369: resolved discrepancy between GCC and Clang.

libxsmm · Mar 4, 2020 · c3e5d45 · c3e5d45
1 parent 13c1f1a
commit c3e5d45
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -207,9 +207,6 @@ endif
 # avoid to link with C++ standard library
 FORCE_CXX = 0
 
-# GCC-10 style linkage (error for duplicate symbols)
-COMMON = 0
-
 # include common Makefile artifacts
 include $(ROOTDIR)/Makefile.inc
 

diff --git a/include/libxsmm_macros.h b/include/libxsmm_macros.h
@@ -154,7 +154,7 @@
 
 /* LIBXSMM_ATTRIBUTE_USED: mark library functions as used to avoid warning */
 #if defined(__GNUC__) || defined(__clang__) || (defined(__INTEL_COMPILER) && !defined(_WIN32))
-# if !defined(__cplusplus)
+# if !defined(__cplusplus) || !defined(__clang__)
 #   define LIBXSMM_ATTRIBUTE_COMMON LIBXSMM_ATTRIBUTE(common)
 # else
 #   define LIBXSMM_ATTRIBUTE_COMMON

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-master-1.14-1401
+master-1.14-1402