release/20.x: [SystemZ] Add header guard macros to vecintrin.h (#129170) #129286
Conversation
|
@uweigand What do you think about merging this PR to the release branch? |
llvmbot
added
clang
|
@llvm/pr-subscribers-backend-x86 @llvm/pr-subscribers-clang Author: None (llvmbot) ChangesBackport ddaa5b3 Requested by: @uweigand Full diff: https://github.com/llvm/llvm-project/pull/129286.diff 1 Files Affected:
diff --git a/clang/lib/Headers/vecintrin.h b/clang/lib/Headers/vecintrin.h
index a14c39f9f7313..338ea51ce8863 100644
--- a/clang/lib/Headers/vecintrin.h
+++ b/clang/lib/Headers/vecintrin.h
@@ -7,6 +7,9 @@
*===-----------------------------------------------------------------------===
*/
+#ifndef _VECINTRIN_H
+#define _VECINTRIN_H
+
#if defined(__s390x__) && defined(__VEC__)
#define __ATTRS_ai __attribute__((__always_inline__))
@@ -12861,3 +12864,5 @@ vec_search_string_until_zero_cc(__vector unsigned int __a,
#error "Use -fzvector to enable vector extensions"
#endif
+
+#endif /* _VECINTRIN_H */
|
|
@llvm/pr-subscribers-backend-x86 Author: None (llvmbot) ChangesBackport ddaa5b3 Requested by: @uweigand Full diff: https://github.com/llvm/llvm-project/pull/129286.diff 1 Files Affected:
diff --git a/clang/lib/Headers/vecintrin.h b/clang/lib/Headers/vecintrin.h
index a14c39f9f7313..338ea51ce8863 100644
--- a/clang/lib/Headers/vecintrin.h
+++ b/clang/lib/Headers/vecintrin.h
@@ -7,6 +7,9 @@
*===-----------------------------------------------------------------------===
*/
+#ifndef _VECINTRIN_H
+#define _VECINTRIN_H
+
#if defined(__s390x__) && defined(__VEC__)
#define __ATTRS_ai __attribute__((__always_inline__))
@@ -12861,3 +12864,5 @@ vec_search_string_until_zero_cc(__vector unsigned int __a,
#error "Use -fzvector to enable vector extensions"
#endif
+
+#endif /* _VECINTRIN_H */
|
github-project-automation
bot
moved this from Needs Triage
to Needs Merge
in LLVM Release Status
|
Does this need to be in 20.1.0 or could it wait until 20.1.1 ? |
I don't think this is particularly urgent. |
Add header guard macros to clang/lib/Headers/vecintrin.h. Found while compiling the latest numpy with clang 19 on s390x which ends up including vecintrin.h twice. The gcc version of this file has header guards so numpy compiles fine with gcc. Signed-off-by: Jonathan Albrecht <[email protected]> (cherry picked from commit ddaa5b3)
github-project-automation
bot
moved this from Needs Merge
to Done
in LLVM Release Status
|
@uweigand (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR. |
4 participants
Backport ddaa5b3
Requested by: @uweigand