diff options
| author | Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org> | 2017-12-30 03:44:34 +0300 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2018-01-18 22:07:25 +0300 |
| commit | 2bbecec83bc1d8ca1b45f98214d2dbbe13950e25 (patch) | |
| tree | 025ff74d4bedfb0e6f5a80a3a785d3bb81a8e405 /include | |
| parent | db250be8b7363b24708ebc9476aa26fe1754d3c0 (diff) | |
include: inline compiler.h spec
compiler.h header contains one internal definition used only in
platform-optimized headers. This definition, being internal, is not a
part of the specification, so let's merge it into linux-gen plat file
and drop compiler.h headers.
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | include/odp/api/compiler.h | 26 | ||||
| -rw-r--r-- | include/odp/api/spec/compiler.h | 53 | ||||
| -rw-r--r-- | include/odp_api.h | 1 |
4 files changed, 0 insertions, 82 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 9e88bbcaf..d463b6d73 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -11,7 +11,6 @@ odpapiinclude_HEADERS = \ odp/api/byteorder.h \ odp/api/chksum.h \ odp/api/classification.h \ - odp/api/compiler.h \ odp/api/cpu.h \ odp/api/cpumask.h \ odp/api/crypto.h \ @@ -61,7 +60,6 @@ odpapispecinclude_HEADERS = \ odp/api/spec/byteorder.h \ odp/api/spec/chksum.h \ odp/api/spec/classification.h \ - odp/api/spec/compiler.h \ odp/api/spec/cpu.h \ odp/api/spec/cpumask.h \ odp/api/spec/crypto.h \ diff --git a/include/odp/api/compiler.h b/include/odp/api/compiler.h deleted file mode 100644 index 04e815bb0..000000000 --- a/include/odp/api/compiler.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (c) 2014, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * Compiler related - */ - -#ifndef ODP_API_COMPILER_H_ -#define ODP_API_COMPILER_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/api/spec/compiler.h> - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/include/odp/api/spec/compiler.h b/include/odp/api/spec/compiler.h deleted file mode 100644 index 443607fbd..000000000 --- a/include/odp/api/spec/compiler.h +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright (c) 2014, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - - -/** - * @file - * - * Compiler related - */ - -#ifndef ODP_API_SPEC_COMPILER_H_ -#define ODP_API_SPEC_COMPILER_H_ -#include <odp/visibility_begin.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/** @addtogroup odp_compiler_optim - * Macro for old compilers - * @{ - */ - -/** @internal GNU compiler version */ -#define GCC_VERSION (__GNUC__ * 10000 \ - + __GNUC_MINOR__ * 100 \ - + __GNUC_PATCHLEVEL__) - -/** - * @internal - * Compiler __builtin_bswap16() is not available on all platforms - * until GCC 4.8.0 - work around this by offering __odp_builtin_bswap16() - * Don't use this function directly, instead see odp_byteorder.h - */ -#if GCC_VERSION < 40800 -#define __odp_builtin_bswap16(u16) ((((u16)&0x00ff) << 8)|(((u16)&0xff00) >> 8)) -#else -#define __odp_builtin_bswap16(u16) __builtin_bswap16(u16) -#endif - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#include <odp/visibility_end.h> -#endif diff --git a/include/odp_api.h b/include/odp_api.h index 069ec9d1e..51558d6bc 100644 --- a/include/odp_api.h +++ b/include/odp_api.h @@ -21,7 +21,6 @@ extern "C" { #include <odp/api/deprecated.h> #include <odp/api/version.h> #include <odp/api/std_types.h> -#include <odp/api/compiler.h> #include <odp/api/align.h> #include <odp/api/hash.h> #include <odp/api/chksum.h> |