- Fix build with GCC 14 patch.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm17?expand=0&rev=32
This commit is contained in:
Aaron Puchert 2024-08-31 22:29:05 +00:00 committed by Git OBS Bridge
parent 9403a5e317
commit e49ddc4d49

View File

@ -1,4 +1,4 @@
From 4b0c8c8576f95ddc216c9b33fce9f4226f465d00 Mon Sep 17 00:00:00 2001 From b759349d5bbff6db186034ebf29b1128cfdbf212 Mon Sep 17 00:00:00 2001
From: Nikita Popov <npopov@redhat.com> From: Nikita Popov <npopov@redhat.com>
Date: Fri, 19 Jan 2024 15:19:58 +0100 Date: Fri, 19 Jan 2024 15:19:58 +0100
Subject: [PATCH] [Clang] Fix build with GCC 14 on ARM (#78704) Subject: [PATCH] [Clang] Fix build with GCC 14 on ARM (#78704)
@ -14,8 +14,9 @@ an empty macro argument, so this is the hack I'm implementing here.
Fixes https://github.com/llvm/llvm-project/issues/78691. Fixes https://github.com/llvm/llvm-project/issues/78691.
--- ---
clang/include/clang/Basic/TokenKinds.def | 3 ++- clang/include/clang/Basic/TokenKinds.def | 3 ++-
clang/include/clang/Basic/TokenKinds.h | 2 +-
clang/utils/TableGen/ClangAttrEmitter.cpp | 2 +- clang/utils/TableGen/ClangAttrEmitter.cpp | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-) 3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/clang/include/clang/Basic/TokenKinds.def b/clang/include/clang/Basic/TokenKinds.def diff --git a/clang/include/clang/Basic/TokenKinds.def b/clang/include/clang/Basic/TokenKinds.def
index ef0dad0f2dcd..3add13c079f3 100644 index ef0dad0f2dcd..3add13c079f3 100644
@ -32,6 +33,19 @@ index ef0dad0f2dcd..3add13c079f3 100644
#endif #endif
#include "clang/Basic/AttrTokenKinds.inc" #include "clang/Basic/AttrTokenKinds.inc"
diff --git a/clang/include/clang/Basic/TokenKinds.h b/clang/include/clang/Basic/TokenKinds.h
index e4857405bc7f..ff117bd5afc5 100644
--- a/clang/include/clang/Basic/TokenKinds.h
+++ b/clang/include/clang/Basic/TokenKinds.h
@@ -109,7 +109,7 @@ bool isPragmaAnnotation(TokenKind K);
inline constexpr bool isRegularKeywordAttribute(TokenKind K) {
return (false
-#define KEYWORD_ATTRIBUTE(X) || (K == tok::kw_##X)
+#define KEYWORD_ATTRIBUTE(X, ...) || (K == tok::kw_##X)
#include "clang/Basic/AttrTokenKinds.inc"
);
}
diff --git a/clang/utils/TableGen/ClangAttrEmitter.cpp b/clang/utils/TableGen/ClangAttrEmitter.cpp diff --git a/clang/utils/TableGen/ClangAttrEmitter.cpp b/clang/utils/TableGen/ClangAttrEmitter.cpp
index b5813c6abc2b..79db17501b64 100644 index b5813c6abc2b..79db17501b64 100644
--- a/clang/utils/TableGen/ClangAttrEmitter.cpp --- a/clang/utils/TableGen/ClangAttrEmitter.cpp