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 75cfc6f70d5b21d6f04082e1d03a7e677a895280 (commit) via 052d2687930e5a99568e9349ca9704ae507e8dc5 (commit) via 0ff7861b8a958b5e23adc5b13783aeeff0629e03 (commit) from 50cb30d14d432257f0a80da45b71bce2ddacad8d (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 75cfc6f70d5b21d6f04082e1d03a7e677a895280 Merge: 50cb30d1 052d2687 Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Tue Oct 3 12:56:27 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 3e26aab4,0ebb6f76..8f6c6570 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@@ -290,16 -219,21 +277,26 @@@ __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
if ARCH_IS_ARM - __LIB__libodp_linux_la_SOURCES += arch/arm/odp_cpu_arch.c \ - arch/arm/odp_sysinfo_parse.c + __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ + arch/default/odp_cpu_cycles.c \ + arch/default/odp_global_time.c \ + arch/default/odp_sysinfo_parse.c + arch_odp_headers = $(srcdir)/arch/arm/odp/api/cpu_arch.h + endif + if ARCH_IS_AARCH64 + __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ + arch/default/odp_cpu_cycles.c \ + arch/aarch64/odp_global_time.c \ + arch/default/odp_sysinfo_parse.c + arch_odp_headers = $(srcdir)/arch/aarch64/odp/api/cpu_arch.h endif if ARCH_IS_MIPS64 __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_arch.c \
-----------------------------------------------------------------------
Summary of changes: configure.ac | 3 +- platform/Makefile.inc | 19 ------ platform/linux-generic/Makefile.am | 43 ++++++++----- .../arch/{arm => aarch64}/odp/api/cpu_arch.h | 0 .../odp_cpu_arch.c => aarch64/odp_global_time.c} | 45 -------------- .../linux-generic/arch/arm/odp_sysinfo_parse.c | 28 --------- platform/linux-generic/arch/default/odp_cpu_arch.c | 28 --------- .../linux-generic/arch/default/odp_cpu_cycles.c | 11 +++- .../odp_cpu_arch.c => default/odp_global_time.c} | 28 ++------- platform/linux-generic/arch/mips64/odp_cpu_arch.c | 25 -------- platform/linux-generic/arch/powerpc/odp_cpu_arch.c | 25 -------- .../linux-generic/arch/powerpc/odp_global_time.c | 15 +++++ platform/linux-generic/arch/x86/odp_cpu_arch.c | 72 ---------------------- .../arch/x86/{odp_cpu_arch.c => odp_global_time.c} | 34 ++-------- 14 files changed, 62 insertions(+), 314 deletions(-) copy platform/linux-generic/arch/{arm => aarch64}/odp/api/cpu_arch.h (100%) rename platform/linux-generic/arch/{arm/odp_cpu_arch.c => aarch64/odp_global_time.c} (65%) delete mode 100644 platform/linux-generic/arch/arm/odp_sysinfo_parse.c copy test/common_plat/validation/api/classification/classification_main.c => platform/linux-generic/arch/default/odp_cpu_cycles.c (50%) copy platform/linux-generic/arch/{mips64/odp_cpu_arch.c => default/odp_global_time.c} (53%) create mode 100644 platform/linux-generic/arch/powerpc/odp_global_time.c copy platform/linux-generic/arch/x86/{odp_cpu_arch.c => odp_global_time.c} (79%)
hooks/post-receive