diff options
author | Matias Elo <matias.elo@nokia.com> | 2022-03-01 13:56:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-01 13:56:00 +0200 |
commit | 6c96e7253082bdc5b3a6a6f39a1ced8200a39ee0 (patch) | |
tree | 908bd33aff383744a8cc18e4f8374c22ed61c46c /platform/linux-generic/Makefile.am | |
parent | 09a1f287c7956b36db8b3320a45e10a22058c269 (diff) | |
parent | 4c9bd497c64a8dada64e205c57c6db7dddacb1ec (diff) |
Merge ODP v1.34.0.0v1.34.0.0_DPDK_19.11
Merge ODP linux-generic v1.34.0.0 into linux-dpdk.
Diffstat (limited to 'platform/linux-generic/Makefile.am')
-rw-r--r-- | platform/linux-generic/Makefile.am | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 64245801e..07f1f462b 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -321,7 +321,7 @@ noinst_HEADERS += arch/aarch64/odp_atomic.h \ arch/aarch64/cpu_flags.h \ arch/aarch64/odp_cpu_idling.h \ arch/aarch64/odp_llsc.h \ - arch/default/odp_random.h + arch/aarch64/odp_random.h endif if ARCH_IS_DEFAULT __LIB__libodp_linux_la_SOURCES += arch/default/odp_atomic.c \ @@ -344,26 +344,6 @@ noinst_HEADERS += arch/default/odp_atomic.h \ arch/default/odp_cpu_idling.h \ arch/default/odp_random.h endif -if ARCH_IS_MIPS64 -__LIB__libodp_linux_la_SOURCES += arch/default/odp_atomic.c \ - arch/default/odp_global_time.c \ - arch/default/odp_hash_crc32.c \ - arch/default/odp_random.c \ - arch/mips64/odp_sysinfo_parse.c -odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_time.h \ - arch/default/odp/api/abi/hash_crc32.h -if !ODP_ABI_COMPAT -odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/atomic_generic.h \ - arch/default/odp/api/abi/atomic_inlines.h \ - arch/default/odp/api/abi/cpu_generic.h \ - arch/mips64/odp/api/abi/cpu_inlines.h \ - arch/mips64/odp/api/abi/cpu.h -endif -noinst_HEADERS += arch/default/odp_atomic.h \ - arch/default/odp_cpu.h \ - arch/default/odp_cpu_idling.h \ - arch/default/odp_random.h -endif if ARCH_IS_POWERPC __LIB__libodp_linux_la_SOURCES += arch/default/odp_atomic.c \ arch/default/odp_cpu_cycles.c \ |