[ovs-dev] [PATCH] sparse: Fix incompatibility with glibc 2.28 and later.

Ben Pfaff blp at ovn.org
Wed Dec 12 17:51:49 UTC 2018


Signed-off-by: Ben Pfaff <blp at ovn.org>
---
 include/sparse/automake.mk |  3 ++-
 include/sparse/threads.h   | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 include/sparse/threads.h

diff --git a/include/sparse/automake.mk b/include/sparse/automake.mk
index 79ce0b7d9ffa..985ee6a2fc5e 100644
--- a/include/sparse/automake.mk
+++ b/include/sparse/automake.mk
@@ -25,4 +25,5 @@ noinst_HEADERS += \
         include/sparse/sys/socket.h \
         include/sparse/sys/sysmacros.h \
         include/sparse/sys/types.h \
-        include/sparse/sys/wait.h
+        include/sparse/sys/wait.h \
+        include/sparse/threads.h
diff --git a/include/sparse/threads.h b/include/sparse/threads.h
new file mode 100644
index 000000000000..245fcca8276e
--- /dev/null
+++ b/include/sparse/threads.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2018 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __CHECKER__
+#error "Use this header only with sparse.  It is not a correct implementation."
+#endif
+
+/* Get actual <threads.h> definitions for us to annotate and build on. */
+#include_next <threads.h>
+
+/* Glibc 2.28 defines thread_local to _Thread_local, which sparse doesn't
+ * understand. */
+#undef thread_local
+#define thread_local __thread
-- 
2.16.1



More information about the dev mailing list