diff options
| author | Petri Savolainen <petri.savolainen@linaro.org> | 2018-03-06 10:40:06 +0200 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2018-03-07 16:52:51 +0300 |
| commit | 80b9a1e4d6a297ac916cbaf360e7b2114ef86a7a (patch) | |
| tree | 627ded5e2841fbeef077e4851fea7fc1799fc18c | |
| parent | 7135eda6854ba60d6379ca5799b4b58959e998b5 (diff) | |
linux-gen: version: implementation name content
Removed quotes from implementation name (from "odp-linux" to
odp_linux). Added ODP_ prefix to name and build version macros.
Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | platform/Makefile.inc | 2 | ||||
| -rw-r--r-- | platform/linux-generic/m4/configure.m4 | 2 | ||||
| -rw-r--r-- | platform/linux-generic/odp_impl.c | 30 |
4 files changed, 7 insertions, 31 deletions
diff --git a/configure.ac b/configure.ac index f9e7f73b8..31f24aa89 100644 --- a/configure.ac +++ b/configure.ac @@ -240,7 +240,7 @@ AS_IF([test "${with_platform}" = "linux-generic"], [m4_include([./platform/linux-generic/m4/configure.m4])], [AC_MSG_ERROR([UNSUPPORTED PLATFORM: ${with_platform}])]) -AC_DEFINE_UNQUOTED([IMPLEMENTATION_NAME], ["$IMPLEMENTATION_NAME"], +AC_DEFINE_UNQUOTED([ODP_IMPLEMENTATION_NAME], ["$ODP_IMPLEMENTATION_NAME"], [Define to the name of the implementation]) ########################################################################## @@ -385,7 +385,7 @@ AC_MSG_RESULT([ ODP Library version: ${ODP_LIBSO_VERSION} Helper Library version: ${ODPHELPER_LIBSO_VERSION} - implementation_name: ${IMPLEMENTATION_NAME} + implementation_name: ${ODP_IMPLEMENTATION_NAME} host: ${host} ARCH_DIR ${ARCH_DIR} ARCH_ABI ${ARCH_ABI} diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 9df96b122..ae4d52f29 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -17,7 +17,7 @@ else AM_LDFLAGS += -export-symbols-regex '^(_deprecated_)?_?odp_' endif -AM_CFLAGS = "-DGIT_HASH=$(VERSION)" +AM_CFLAGS = "-DODP_VERSION_BUILD=$(VERSION)" AM_CFLAGS += $(VISIBILITY_CFLAGS) AM_CFLAGS += @PTHREAD_CFLAGS@ diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index d2ddd495e..e3f276af4 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -1,4 +1,4 @@ -IMPLEMENTATION_NAME="odp-linux" +ODP_IMPLEMENTATION_NAME="odp-linux" ODP_VISIBILITY ODP_ATOMIC diff --git a/platform/linux-generic/odp_impl.c b/platform/linux-generic/odp_impl.c index b6994295d..227d50005 100644 --- a/platform/linux-generic/odp_impl.c +++ b/platform/linux-generic/odp_impl.c @@ -5,26 +5,11 @@ */ #include "config.h" - - -/** - * @file - * - * ODP Implementation information - */ - -#ifndef ODP_IMPL_H_ -#define ODP_IMPL_H_ - -#ifdef __cplusplus -extern "C" { -#endif - #include <odp/api/version.h> #define ODP_VERSION_IMPL 0 #define ODP_VERSION_IMPL_STR \ - ODP_VERSION_TO_STR(IMPLEMENTATION_NAME) " " \ + ODP_IMPLEMENTATION_NAME " " \ ODP_VERSION_TO_STR(ODP_VERSION_API_GENERATION) "." \ ODP_VERSION_TO_STR(ODP_VERSION_API_MAJOR) "." \ ODP_VERSION_TO_STR(ODP_VERSION_API_MINOR) "-" \ @@ -32,10 +17,7 @@ extern "C" { ODP_VERSION_TO_STR(ODP_VERSION_API_GENERATION) "." \ ODP_VERSION_TO_STR(ODP_VERSION_API_MAJOR) "." \ ODP_VERSION_TO_STR(ODP_VERSION_API_MINOR) ") " \ - ODP_VERSION_TO_STR(GIT_HASH) - -#define ODP_VERSION_IMPL_NAME \ - ODP_VERSION_TO_STR(IMPLEMENTATION_NAME) + ODP_VERSION_TO_STR(ODP_VERSION_BUILD) const char *odp_version_impl_str(void) { @@ -44,11 +26,5 @@ const char *odp_version_impl_str(void) const char *odp_version_impl_name(void) { - return ODP_VERSION_IMPL_NAME; + return ODP_IMPLEMENTATION_NAME; } - -#ifdef __cplusplus -} -#endif - -#endif |