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, api-next has been updated via e3c2e06c4420f41d7053e615ac1cc6c1dc315407 (commit) via e7e92031e08fe525e421ab30223b7398881ed42e (commit) from f9dcbcc3f45fcd6d825c087fc55c631d6b30fa8c (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 e3c2e06c4420f41d7053e615ac1cc6c1dc315407 Merge: f9dcbcc3 e7e92031 Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Fri Jun 23 12:36:45 2017 +0300
Merge branch 'master' into api-next
Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --cc platform/linux-generic/Makefile.am index e6ff0033,989a65b6..2293f7f0 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@@ -249,19 -229,24 +261,29 @@@ __LIB__libodp_linux_la_SOURCES = odp_timer_wheel.c \ odp_traffic_mngr.c \ odp_version.c \ - odp_weak.c + odp_weak.c \ + drv_atomic.c \ + drv_barrier.c \ + drv_driver.c \ + drv_shm.c \ - drv_spinlock.c \ - arch/@ARCH_DIR@/odp_cpu_arch.c \ - arch/@ARCH_DIR@/odp_sysinfo_parse.c - - __LIB__libodp_linux_la_LIBADD = $(ATOMIC_LIBS) ++ drv_spinlock.c
+ if ARCH_IS_ARM + __LIB__libodp_linux_la_SOURCES += arch/arm/odp_cpu_arch.c \ + arch/arm/odp_sysinfo_parse.c + endif + if ARCH_IS_MIPS64 + __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_arch.c \ + arch/mips64/odp_sysinfo_parse.c + endif + if ARCH_IS_POWERPC + __LIB__libodp_linux_la_SOURCES += arch/powerpc/odp_cpu_arch.c \ + arch/powerpc/odp_sysinfo_parse.c + endif if ARCH_IS_X86 - __LIB__libodp_linux_la_SOURCES += arch/@ARCH_DIR@/cpu_flags.c + __LIB__libodp_linux_la_SOURCES += arch/x86/cpu_flags.c \ + arch/x86/odp_cpu_arch.c \ + arch/x86/odp_sysinfo_parse.c endif
if HAVE_PCAP
-----------------------------------------------------------------------
Summary of changes: configure.ac | 3 +++ platform/linux-generic/Makefile.am | 40 ++++++++++++++++++++++++++++++-------- 2 files changed, 35 insertions(+), 8 deletions(-)
hooks/post-receive