aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>2017-10-22 14:41:56 +0300
committerMaxim Uvarov <maxim.uvarov@linaro.org>2018-01-18 22:07:23 +0300
commita8ce5f13b5cbf1583fef04d687cef94d18357520 (patch)
tree72dc37d14fccf8037516d6d4c11cd125b5ff683a
parente93535eed4262b76597c193a169fbc94fd91bb25 (diff)
linux-gen, include: switch thread.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
-rw-r--r--include/Makefile.am7
-rw-r--r--include/odp/api/abi-default/thread.h (renamed from platform/linux-generic/include/odp/api/plat/thread_types.h)4
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/thread.h7
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/thread.h7
-rw-r--r--include/odp/arch/mips64-linux/odp/api/abi/thread.h7
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/thread.h7
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/thread.h7
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/thread.h7
-rw-r--r--platform/linux-generic/Makefile.am2
-rw-r--r--platform/linux-generic/include-abi/odp/api/abi/thread.h7
-rw-r--r--platform/linux-generic/include/odp/api/thread.h6
11 files changed, 62 insertions, 6 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 4b4a9f1f7..adc13a11b 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -73,6 +73,7 @@ odpapiabidefaultinclude_HEADERS = \
odp/api/abi-default/shared_memory.h \
odp/api/abi-default/spinlock.h \
odp/api/abi-default/spinlock_recursive.h \
+ odp/api/abi-default/thread.h \
odp/api/abi-default/version.h
# Insall ABI headers only if required
@@ -98,6 +99,7 @@ odpapiabiarchinclude_HEADERS = \
odp/arch/arm32-linux/odp/api/abi/shared_memory.h \
odp/arch/arm32-linux/odp/api/abi/spinlock.h \
odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h \
+ odp/arch/arm32-linux/odp/api/abi/thread.h \
odp/arch/arm32-linux/odp/api/abi/version.h
endif
if ARCH_IS_AARCH64
@@ -119,6 +121,7 @@ odpapiabiarchinclude_HEADERS = \
odp/arch/arm64-linux/odp/api/abi/shared_memory.h \
odp/arch/arm64-linux/odp/api/abi/spinlock.h \
odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h \
+ odp/arch/arm64-linux/odp/api/abi/thread.h \
odp/arch/arm64-linux/odp/api/abi/version.h
endif
if ARCH_IS_MIPS64
@@ -140,6 +143,7 @@ odpapiabiarchinclude_HEADERS = \
odp/arch/mips64-linux/odp/api/abi/shared_memory.h \
odp/arch/mips64-linux/odp/api/abi/spinlock.h \
odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h \
+ odp/arch/mips64-linux/odp/api/abi/thread.h \
odp/arch/mips64-linux/odp/api/abi/version.h
endif
if ARCH_IS_POWERPC
@@ -161,6 +165,7 @@ odpapiabiarchinclude_HEADERS = \
odp/arch/power64-linux/odp/api/abi/shared_memory.h \
odp/arch/power64-linux/odp/api/abi/spinlock.h \
odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h \
+ odp/arch/power64-linux/odp/api/abi/thread.h \
odp/arch/power64-linux/odp/api/abi/version.h
endif
if ARCH_IS_X86_32
@@ -182,6 +187,7 @@ odpapiabiarchinclude_HEADERS = \
odp/arch/x86_32-linux/odp/api/abi/shared_memory.h \
odp/arch/x86_32-linux/odp/api/abi/spinlock.h \
odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h \
+ odp/arch/x86_32-linux/odp/api/abi/thread.h \
odp/arch/x86_32-linux/odp/api/abi/version.h
endif
if ARCH_IS_X86_64
@@ -203,6 +209,7 @@ odpapiabiarchinclude_HEADERS = \
odp/arch/x86_64-linux/odp/api/abi/shared_memory.h \
odp/arch/x86_64-linux/odp/api/abi/spinlock.h \
odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h \
+ odp/arch/x86_64-linux/odp/api/abi/thread.h \
odp/arch/x86_64-linux/odp/api/abi/version.h
endif
endif # ODP_ABI_COMPAT
diff --git a/platform/linux-generic/include/odp/api/plat/thread_types.h b/include/odp/api/abi-default/thread.h
index 33af45983..682d85005 100644
--- a/platform/linux-generic/include/odp/api/plat/thread_types.h
+++ b/include/odp/api/abi-default/thread.h
@@ -10,8 +10,8 @@
* ODP thread
*/
-#ifndef ODP_THREAD_TYPES_H_
-#define ODP_THREAD_TYPES_H_
+#ifndef ODP_ABI_THREAD_H_
+#define ODP_ABI_THREAD_H_
#ifdef __cplusplus
extern "C" {
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/thread.h b/include/odp/arch/arm32-linux/odp/api/abi/thread.h
new file mode 100644
index 000000000..dc29a7dac
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/thread.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/thread.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/thread.h b/include/odp/arch/arm64-linux/odp/api/abi/thread.h
new file mode 100644
index 000000000..dc29a7dac
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/thread.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/thread.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/thread.h b/include/odp/arch/mips64-linux/odp/api/abi/thread.h
new file mode 100644
index 000000000..dc29a7dac
--- /dev/null
+++ b/include/odp/arch/mips64-linux/odp/api/abi/thread.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/thread.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/thread.h b/include/odp/arch/power64-linux/odp/api/abi/thread.h
new file mode 100644
index 000000000..dc29a7dac
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/thread.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/thread.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/thread.h b/include/odp/arch/x86_32-linux/odp/api/abi/thread.h
new file mode 100644
index 000000000..dc29a7dac
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/thread.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/thread.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/thread.h b/include/odp/arch/x86_64-linux/odp/api/abi/thread.h
new file mode 100644
index 000000000..dc29a7dac
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/thread.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/thread.h>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 716f67569..308aed4c5 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -88,7 +88,6 @@ odpapiplatinclude_HEADERS = \
include/odp/api/plat/std_clib_inlines.h \
include/odp/api/plat/strong_types.h \
include/odp/api/plat/sync_inlines.h \
- include/odp/api/plat/thread_types.h \
include/odp/api/plat/thrmask_types.h \
include/odp/api/plat/ticketlock_inlines.h \
include/odp/api/plat/ticketlock_inlines_api.h \
@@ -118,6 +117,7 @@ odpapiabiarchinclude_HEADERS = \
include-abi/odp/api/abi/shared_memory.h \
include-abi/odp/api/abi/spinlock.h \
include-abi/odp/api/abi/spinlock_recursive.h \
+ include-abi/odp/api/abi/thread.h \
include-abi/odp/api/abi/version.h
endif
diff --git a/platform/linux-generic/include-abi/odp/api/abi/thread.h b/platform/linux-generic/include-abi/odp/api/abi/thread.h
new file mode 100644
index 000000000..dc29a7dac
--- /dev/null
+++ b/platform/linux-generic/include-abi/odp/api/abi/thread.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/thread.h>
diff --git a/platform/linux-generic/include/odp/api/thread.h b/platform/linux-generic/include/odp/api/thread.h
index c54abc890..85af314be 100644
--- a/platform/linux-generic/include/odp/api/thread.h
+++ b/platform/linux-generic/include/odp/api/thread.h
@@ -10,14 +10,14 @@
* ODP thread API
*/
-#ifndef ODP_PLAT_THREAD_H_
-#define ODP_PLAT_THREAD_H_
+#ifndef ODP_API_THREAD_H_
+#define ODP_API_THREAD_H_
#ifdef __cplusplus
extern "C" {
#endif
-#include <odp/api/plat/thread_types.h>
+#include <odp/api/abi/thread.h>
#include <odp/api/spec/thread.h>