aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac25
-rw-r--r--m4/ax_prog_doxygen.m42
-rw-r--r--platform/linux-generic/Makefile.am17
-rw-r--r--platform/linux-generic/Makefile.inc4
l---------platform/linux-generic/arch/arm/odp/api/cpu_arch.h1
l---------platform/linux-generic/arch/arm/odp_cpu_arch.c1
l---------platform/linux-generic/arch/arm/odp_sysinfo_parse.c1
-rw-r--r--platform/linux-generic/arch/default/odp/api/cpu_arch.h (renamed from platform/linux-generic/arch/linux/odp/api/cpu_arch.h)0
-rw-r--r--platform/linux-generic/arch/default/odp_cpu_arch.c (renamed from platform/linux-generic/arch/linux/odp_cpu_arch.c)0
-rw-r--r--platform/linux-generic/arch/default/odp_sysinfo_parse.c (renamed from platform/linux-generic/arch/linux/odp_sysinfo_parse.c)0
l---------platform/linux-generic/arch/powerpc/odp_cpu_arch.c2
-rw-r--r--platform/linux-generic/test/Makefile.inc2
12 files changed, 36 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac
index 5e7e38020..3ea33ea13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,13 +59,24 @@ AX_VALGRIND_CHECK
# Which architecture optimizations will we use
##########################################################################
AS_CASE([$host],
- [x86*], [ARCH=x86],
- [i686*], [ARCH=x86],
- [mips64*], [ARCH=mips64],
- [powerpc*], [ARCH=powerpc],
- [ARCH=linux]
+ [x86*], [ARCH_DIR=x86],
+ [i686*], [ARCH_DIR=x86],
+ [mips64*], [ARCH_DIR=mips64],
+ [powerpc*], [ARCH_DIR=powerpc],
+ [aarch64*], [ARCH_DIR=arm],
+ [arm*], [ARCH_DIR=arm],
+ [ARCH_DIR=undefined]
)
-AC_SUBST([ARCH])
+AC_SUBST([ARCH_DIR])
+
+##########################################################################
+# Warn on the defaults if arch is undefined
+##########################################################################
+if test "${ARCH_DIR}" == "undefined";
+then
+ echo "ARCH_DIR is undefined, please add your ARCH_DIR based on host=${host}"
+ exit 1
+fi
##########################################################################
# Set correct pkgconfig version
@@ -226,7 +237,7 @@ AC_MSG_RESULT([
Library version: ${ODP_LIBSO_VERSION}
- arch ${ARCH}
+ ARCH_DIR ${ARCH_DIR}
with_platform: ${with_platform}
prefix: ${prefix}
sysconfdir: ${sysconfdir}
diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4
index 67acd22eb..d2017bd3e 100644
--- a/m4/ax_prog_doxygen.m4
+++ b/m4/ax_prog_doxygen.m4
@@ -272,7 +272,7 @@ DX_ENV_APPEND(VERSION, $VERSION)
DX_ENV_APPEND(WITH_PLATFORM, $with_platform)
DX_ENV_APPEND(PROJECT, $DX_PROJECT)
DX_ENV_APPEND(VERSION, $PACKAGE_VERSION)
-DX_ENV_APPEND(WITH_ARCH, $ARCH)
+DX_ENV_APPEND(WITH_ARCH, $ARCH_DIR)
# Doxygen itself:
DX_ARG_ABLE(doc, [generate any doxygen documentation],
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index b3e0d2855..5081e5196 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -58,7 +58,7 @@ odpapiinclude_HEADERS = \
$(srcdir)/include/odp/api/version.h \
$(srcdir)/include/odp/api/visibility_begin.h \
$(srcdir)/include/odp/api/visibility_end.h \
- $(srcdir)/arch/@ARCH@/odp/api/cpu_arch.h
+ $(srcdir)/arch/@ARCH_DIR@/odp/api/cpu_arch.h
odpapiplatincludedir= $(includedir)/odp/api/plat
odpapiplatinclude_HEADERS = \
@@ -175,13 +175,13 @@ __LIB__libodp_linux_la_SOURCES = \
odp_traffic_mngr.c \
odp_version.c \
odp_weak.c \
- arch/@ARCH@/odp_cpu_arch.c \
- arch/@ARCH@/odp_sysinfo_parse.c
+ arch/@ARCH_DIR@/odp_cpu_arch.c \
+ arch/@ARCH_DIR@/odp_sysinfo_parse.c
EXTRA_DIST = \
- arch/linux/odp/api/cpu_arch.h \
- arch/linux/odp_cpu_arch.c \
- arch/linux/odp_sysinfo_parse.c \
+ arch/default/odp/api/cpu_arch.h \
+ arch/default/odp_cpu_arch.c \
+ arch/default/odp_sysinfo_parse.c \
arch/mips64/odp/api/cpu_arch.h \
arch/mips64/odp_cpu_arch.c \
arch/mips64/odp_sysinfo_parse.c \
@@ -190,7 +190,10 @@ EXTRA_DIST = \
arch/powerpc/odp_sysinfo_parse.c \
arch/x86/odp/api/cpu_arch.h \
arch/x86/odp_cpu_arch.c \
- arch/x86/odp_sysinfo_parse.c
+ arch/x86/odp_sysinfo_parse.c \
+ arch/arm/odp/api/cpu_arch.h \
+ arch/arm/odp_cpu_arch.c \
+ arch/arm/odp_sysinfo_parse.c
if HAVE_PCAP
__LIB__libodp_linux_la_SOURCES += pktio/pcap.c
diff --git a/platform/linux-generic/Makefile.inc b/platform/linux-generic/Makefile.inc
index 048c8bb78..876519bef 100644
--- a/platform/linux-generic/Makefile.inc
+++ b/platform/linux-generic/Makefile.inc
@@ -1,2 +1,2 @@
-AM_CFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH)
-AM_CXXFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH)
+AM_CFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR)
+AM_CXXFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR)
diff --git a/platform/linux-generic/arch/arm/odp/api/cpu_arch.h b/platform/linux-generic/arch/arm/odp/api/cpu_arch.h
new file mode 120000
index 000000000..e86e132b7
--- /dev/null
+++ b/platform/linux-generic/arch/arm/odp/api/cpu_arch.h
@@ -0,0 +1 @@
+../../../default/odp/api/cpu_arch.h \ No newline at end of file
diff --git a/platform/linux-generic/arch/arm/odp_cpu_arch.c b/platform/linux-generic/arch/arm/odp_cpu_arch.c
new file mode 120000
index 000000000..deebc474c
--- /dev/null
+++ b/platform/linux-generic/arch/arm/odp_cpu_arch.c
@@ -0,0 +1 @@
+../default/odp_cpu_arch.c \ No newline at end of file
diff --git a/platform/linux-generic/arch/arm/odp_sysinfo_parse.c b/platform/linux-generic/arch/arm/odp_sysinfo_parse.c
new file mode 120000
index 000000000..39962b8c5
--- /dev/null
+++ b/platform/linux-generic/arch/arm/odp_sysinfo_parse.c
@@ -0,0 +1 @@
+../default/odp_sysinfo_parse.c \ No newline at end of file
diff --git a/platform/linux-generic/arch/linux/odp/api/cpu_arch.h b/platform/linux-generic/arch/default/odp/api/cpu_arch.h
index 29f8889ec..29f8889ec 100644
--- a/platform/linux-generic/arch/linux/odp/api/cpu_arch.h
+++ b/platform/linux-generic/arch/default/odp/api/cpu_arch.h
diff --git a/platform/linux-generic/arch/linux/odp_cpu_arch.c b/platform/linux-generic/arch/default/odp_cpu_arch.c
index 2ac223e07..2ac223e07 100644
--- a/platform/linux-generic/arch/linux/odp_cpu_arch.c
+++ b/platform/linux-generic/arch/default/odp_cpu_arch.c
diff --git a/platform/linux-generic/arch/linux/odp_sysinfo_parse.c b/platform/linux-generic/arch/default/odp_sysinfo_parse.c
index 4dcd6d144..4dcd6d144 100644
--- a/platform/linux-generic/arch/linux/odp_sysinfo_parse.c
+++ b/platform/linux-generic/arch/default/odp_sysinfo_parse.c
diff --git a/platform/linux-generic/arch/powerpc/odp_cpu_arch.c b/platform/linux-generic/arch/powerpc/odp_cpu_arch.c
index c5fe40085..deebc474c 120000
--- a/platform/linux-generic/arch/powerpc/odp_cpu_arch.c
+++ b/platform/linux-generic/arch/powerpc/odp_cpu_arch.c
@@ -1 +1 @@
-../linux/odp_cpu_arch.c \ No newline at end of file
+../default/odp_cpu_arch.c \ No newline at end of file
diff --git a/platform/linux-generic/test/Makefile.inc b/platform/linux-generic/test/Makefile.inc
index 527d8cbba..80b66ae99 100644
--- a/platform/linux-generic/test/Makefile.inc
+++ b/platform/linux-generic/test/Makefile.inc
@@ -11,6 +11,6 @@ LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la
INCCUNIT_COMMON = -I$(top_srcdir)/test/validation/common
INCODP = -I$(top_srcdir)/test \
-I$(top_srcdir)/platform/@with_platform@/include \
- -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH) \
+ -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH_DIR) \
-I$(top_srcdir)/include \
-I$(top_srcdir)/helper/include
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 17:50:05 +0000