This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via 70f5c00a0713856daae879ebe3652d44c5d783f2 (commit) via b72a57524cd02abc873c15a451c40e9cb2dd6ee5 (commit) via c0bf89cf3c36c7f0504e78fe6b337e50e7dc17d4 (commit) via 9c0c41b80fa0f7f7316115fd2228eec57dde5814 (commit) via 2596adf51485f1d996e1e084e6f63dbe68b582a3 (commit) via 545a65fc7064c13deda58fb86b1863365c318500 (commit) from 84c37a0fa947f1a81eef5aff225ecdf73ad3387c (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 70f5c00a0713856daae879ebe3652d44c5d783f2 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Mon Jan 22 07:08:27 2018 +0300
doc: move platform-specific doc distribution to platform/Makefile.inc
${with_platform} in doc/platform-api-guide/Makefile.am will add to distro platform docs only for currently selected platform. Move this to platform/Makefile.inc, so that every platform doc file gets included into distro.
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
diff --git a/doc/platform-api-guide/Makefile.am b/doc/platform-api-guide/Makefile.am index 27cd902e..d1b1b0dc 100644 --- a/doc/platform-api-guide/Makefile.am +++ b/doc/platform-api-guide/Makefile.am @@ -3,8 +3,7 @@ #distribution.
EXTRA_DIST = \ - Doxyfile \ - $(top_srcdir)/platform/${with_platform}/doc/*.dox + Doxyfile
clean-local: diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 4714de0e..410204bf 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -12,3 +12,5 @@ AM_CFLAGS = "-DGIT_HASH=$(VERSION)" AM_CFLAGS += $(VISIBILITY_CFLAGS)
AM_CFLAGS += @PTHREAD_CFLAGS@ + +EXTRA_DIST = doc/platform_specific.dox
commit b72a57524cd02abc873c15a451c40e9cb2dd6ee5 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sat Jan 20 18:45:28 2018 +0300
configure: move pthreads check to properly defined macro
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
diff --git a/m4/odp_pthread.m4 b/m4/odp_pthread.m4 new file mode 100644 index 00000000..f2654ac4 --- /dev/null +++ b/m4/odp_pthread.m4 @@ -0,0 +1,7 @@ +# ODP_PTHREAD +# ----------- +# Check for pthreads availability +AC_DEFUN([ODP_PTHREAD], [dnl +AX_PTHREAD([CC="$PTHREAD_CC"], + [AC_MSG_FAILURE([We require pthreads to be available])]) +]) diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 08ea1a33..7fa3652e 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -3,7 +3,7 @@ IMPLEMENTATION_NAME="odp-linux" ODP_VISIBILITY ODP_ATOMIC
-m4_include([platform/linux-generic/m4/odp_pthread.m4]) +ODP_PTHREAD ODP_TIMER ODP_OPENSSL m4_include([platform/linux-generic/m4/odp_pcap.m4]) diff --git a/platform/linux-generic/m4/odp_pthread.m4 b/platform/linux-generic/m4/odp_pthread.m4 deleted file mode 100644 index 48615894..00000000 --- a/platform/linux-generic/m4/odp_pthread.m4 +++ /dev/null @@ -1,8 +0,0 @@ -########################################################################## -# Check for pthreads availability -########################################################################## - -AX_PTHREAD([CC="$PTHREAD_CC"], [ - echo "Error! We require pthreads to be available" - exit -1 - ])
commit c0bf89cf3c36c7f0504e78fe6b337e50e7dc17d4 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Jan 30 18:47:27 2018 +0300
configure: add ODP_CHECK_CXXFLAG
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
diff --git a/configure.ac b/configure.ac index 01fdc5a8..7b90b212 100644 --- a/configure.ac +++ b/configure.ac @@ -97,6 +97,7 @@ CC_VERSION_PATCH=$(echo $CC_VERSION | cut -d'.' -f3) # Default warning setup ########################################################################## ODP_CFLAGS="$ODP_CFLAGS -W -Wall -Werror" +ODP_CXXFLAGS="$ODP_CXXFLAGS -W -Wall -Werror"
ODP_CHECK_CFLAG([-Wstrict-prototypes]) ODP_CHECK_CFLAG([-Wmissing-prototypes]) diff --git a/m4/odp_check_flag.m4 b/m4/odp_check_flag.m4 index e3c8ef71..827f9f01 100644 --- a/m4/odp_check_flag.m4 +++ b/m4/odp_check_flag.m4 @@ -5,8 +5,22 @@ dnl an error when it encounters an unknown warning option. # --------------------- # Add FLAG to ODP_CFLAGS if compiler supports that option AC_DEFUN([ODP_CHECK_CFLAG], - [AX_CHECK_COMPILE_FLAG([$1], + [AC_LANG_PUSH([C]) + AX_CHECK_COMPILE_FLAG([$1], [ODP_CFLAGS="$ODP_CFLAGS $1"], [], [-W -Wall -Werror], [AC_LANG_SOURCE([int main(void) - {return 0;}])])]) + {return 0;}])]) + AC_LANG_POP([C])]) + +# ODP_CHECK_CXXFLAG(FLAG) +# --------------------- +# Add FLAG to ODP_CFLAGS if compiler supports that option +AC_DEFUN([ODP_CHECK_CXXFLAG], + [AC_LANG_PUSH([C++]) + AX_CHECK_COMPILE_FLAG([$1], + [ODP_CXXFLAGS="$ODP_CXXFLAGS $1"], + [], [-W -Wall -Werror], + [AC_LANG_SOURCE([int main(void) + {return 0;}])]) + AC_LANG_POP([C++])])
commit 9c0c41b80fa0f7f7316115fd2228eec57dde5814 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Jan 19 21:15:29 2018 +0300
configure: set ODP_CFLAGS/CXXFLAGS before descending into platform
platform m4/configure.m4 file might want to change compiler flags. So let's set them before calling into platform file.
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
diff --git a/configure.ac b/configure.ac index 03a233d1..01fdc5a8 100644 --- a/configure.ac +++ b/configure.ac @@ -93,6 +93,43 @@ CC_VERSION_MAJOR=$(echo $CC_VERSION | cut -d'.' -f1) CC_VERSION_MINOR=$(echo $CC_VERSION | cut -d'.' -f2) CC_VERSION_PATCH=$(echo $CC_VERSION | cut -d'.' -f3)
+########################################################################## +# Default warning setup +########################################################################## +ODP_CFLAGS="$ODP_CFLAGS -W -Wall -Werror" + +ODP_CHECK_CFLAG([-Wstrict-prototypes]) +ODP_CHECK_CFLAG([-Wmissing-prototypes]) +ODP_CHECK_CFLAG([-Wmissing-declarations]) +ODP_CHECK_CFLAG([-Wold-style-definition]) +ODP_CHECK_CFLAG([-Wpointer-arith]) +ODP_CHECK_CFLAG([-Wcast-align]) +ODP_CHECK_CFLAG([-Wnested-externs]) +ODP_CHECK_CFLAG([-Wcast-qual]) +ODP_CHECK_CFLAG([-Wformat-nonliteral]) +ODP_CHECK_CFLAG([-Wformat-security]) +ODP_CHECK_CFLAG([-Wundef]) +ODP_CHECK_CFLAG([-Wwrite-strings]) +ODP_CHECK_CFLAG([-Wformat-truncation=0]) +ODP_CHECK_CFLAG([-Wformat-overflow=0]) + +ODP_CFLAGS="$ODP_CFLAGS -std=c99" +ODP_CXXFLAGS="$ODP_CXXFLAGS -std=c++11" + +# Extra flags for example to suppress certain warning types +ODP_CFLAGS="$ODP_CFLAGS $ODP_CFLAGS_EXTRA" + +########################################################################## +# Check if compiler supports cmpxchng16 on x86-based architectures +########################################################################## +case "${host}" in + i?86? | x86*) + if test "${CC}" != "gcc" -o ${CC_VERSION_MAJOR} -ge 5; then + ODP_CHECK_CFLAG([-mcx16]) + fi + ;; +esac + ########################################################################## # Allow valgrind suite to run against the defined tests ########################################################################## @@ -310,43 +347,6 @@ AC_ARG_ENABLE([deprecated], fi]) AC_SUBST(ODP_DEPRECATED_API)
-########################################################################## -# Default warning setup -########################################################################## -ODP_CFLAGS="$ODP_CFLAGS -W -Wall -Werror" - -ODP_CHECK_CFLAG([-Wstrict-prototypes]) -ODP_CHECK_CFLAG([-Wmissing-prototypes]) -ODP_CHECK_CFLAG([-Wmissing-declarations]) -ODP_CHECK_CFLAG([-Wold-style-definition]) -ODP_CHECK_CFLAG([-Wpointer-arith]) -ODP_CHECK_CFLAG([-Wcast-align]) -ODP_CHECK_CFLAG([-Wnested-externs]) -ODP_CHECK_CFLAG([-Wcast-qual]) -ODP_CHECK_CFLAG([-Wformat-nonliteral]) -ODP_CHECK_CFLAG([-Wformat-security]) -ODP_CHECK_CFLAG([-Wundef]) -ODP_CHECK_CFLAG([-Wwrite-strings]) -ODP_CHECK_CFLAG([-Wformat-truncation=0]) -ODP_CHECK_CFLAG([-Wformat-overflow=0]) - -ODP_CFLAGS="$ODP_CFLAGS -std=c99" -ODP_CXXFLAGS="$ODP_CXXFLAGS -std=c++11" - -# Extra flags for example to suppress certain warning types -ODP_CFLAGS="$ODP_CFLAGS $ODP_CFLAGS_EXTRA" - -########################################################################## -# Check if compiler supports cmpxchng16 on x86-based architectures -########################################################################## -case "${host}" in - i?86? | x86*) - if test "${CC}" != "gcc" -o ${CC_VERSION_MAJOR} -ge 5; then - ODP_CHECK_CFLAG([-mcx16]) - fi - ;; -esac - ########################################################################## # Default include setup ##########################################################################
commit 2596adf51485f1d996e1e084e6f63dbe68b582a3 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Jan 30 18:44:46 2018 +0300
configure: move ODP_CHECK_CFLAG to separate file
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
diff --git a/configure.ac b/configure.ac index 1edc01f4..03a233d1 100644 --- a/configure.ac +++ b/configure.ac @@ -315,14 +315,6 @@ AC_SUBST(ODP_DEPRECATED_API) ########################################################################## ODP_CFLAGS="$ODP_CFLAGS -W -Wall -Werror"
-dnl Use -Werror in the checks below since Clang emits a warning instead of -dnl an error when it encounters an unknown warning option. -AC_DEFUN([ODP_CHECK_CFLAG], - [AX_CHECK_COMPILE_FLAG([$1], - [ODP_CFLAGS="$ODP_CFLAGS $1"], - [], [-W -Wall -Werror], - [AC_LANG_SOURCE([int main(void) - {return 0;}])])]) ODP_CHECK_CFLAG([-Wstrict-prototypes]) ODP_CHECK_CFLAG([-Wmissing-prototypes]) ODP_CHECK_CFLAG([-Wmissing-declarations]) diff --git a/m4/odp_check_flag.m4 b/m4/odp_check_flag.m4 new file mode 100644 index 00000000..e3c8ef71 --- /dev/null +++ b/m4/odp_check_flag.m4 @@ -0,0 +1,12 @@ +dnl Use -Werror in the checks below since Clang emits a warning instead of +dnl an error when it encounters an unknown warning option. + +# ODP_CHECK_CFLAG(FLAG) +# --------------------- +# Add FLAG to ODP_CFLAGS if compiler supports that option +AC_DEFUN([ODP_CHECK_CFLAG], + [AX_CHECK_COMPILE_FLAG([$1], + [ODP_CFLAGS="$ODP_CFLAGS $1"], + [], [-W -Wall -Werror], + [AC_LANG_SOURCE([int main(void) + {return 0;}])])])
commit 545a65fc7064c13deda58fb86b1863365c318500 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Jan 19 21:15:29 2018 +0300
configure: set ODP_ABI_COMPAT before descending into platform
platform m4/configure.m4 file can make use of ODP_ABI_COMPAT. So let's set it before calling into platform file.
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
diff --git a/configure.ac b/configure.ac index 6d76bead..1edc01f4 100644 --- a/configure.ac +++ b/configure.ac @@ -160,6 +160,21 @@ fi PKGCONFIG_VERSION=$(echo $VERSION | awk -F '.git' '{print $1}') AC_SUBST(PKGCONFIG_VERSION)
+########################################################################## +# Enable/disable ABI compatible build +########################################################################## +ODP_ABI_COMPAT=1 +abi_compat=yes +AC_ARG_ENABLE([abi-compat], + [ --disable-abi-compat disables ABI compatible mode, enables inline code in header files], + [if test "x$enableval" = "xno"; then + ODP_ABI_COMPAT=0 + abi_compat=no + #if there is no ABI compatibility the .so numbers are meaningless + ODP_LIBSO_VERSION=0:0:0 + fi]) +AM_CONDITIONAL(ODP_ABI_COMPAT, [test "x$ODP_ABI_COMPAT" = "x1"]) + ########################################################################## # Determine which platform to build for ########################################################################## @@ -282,21 +297,6 @@ AS_IF([test "x$enable_helper_debug_print" != "xno"], [ODPH_DEBUG_PRINT=1], AC_DEFINE_UNQUOTED([ODPH_DEBUG_PRINT], [$ODPH_DEBUG_PRINT], [Define to 1 to display helper debug information])
-########################################################################## -# Enable/disable ABI compatible build -########################################################################## -ODP_ABI_COMPAT=1 -abi_compat=yes -AC_ARG_ENABLE([abi-compat], - [ --disable-abi-compat disables ABI compatible mode, enables inline code in header files], - [if test "x$enableval" = "xno"; then - ODP_ABI_COMPAT=0 - abi_compat=no - #if there is no ABI compatibility the .so numbers are meaningless - ODP_LIBSO_VERSION=0:0:0 - fi]) -AM_CONDITIONAL(ODP_ABI_COMPAT, [test "x$ODP_ABI_COMPAT" = "x1"]) - ########################################################################## # Enable/disable deprecated API definitions ##########################################################################
-----------------------------------------------------------------------
Summary of changes: configure.ac | 113 +++++++++++++++---------------- doc/platform-api-guide/Makefile.am | 3 +- m4/odp_check_flag.m4 | 26 +++++++ m4/odp_pthread.m4 | 7 ++ platform/Makefile.inc | 2 + platform/linux-generic/m4/configure.m4 | 2 +- platform/linux-generic/m4/odp_pthread.m4 | 8 --- 7 files changed, 90 insertions(+), 71 deletions(-) create mode 100644 m4/odp_check_flag.m4 create mode 100644 m4/odp_pthread.m4 delete mode 100644 platform/linux-generic/m4/odp_pthread.m4
hooks/post-receive