Merge branch 'arm' into 'master'

Fix ARM support

See merge request nvidia/container-toolkit/libnvidia-container!10

Author: RenaudWasTaken

mk/Dockerfile.centos

@@ -28,8 +28,8 @@ ENV WITH_SECCOMP=${WITH_SECCOMP}
 RUN if [ "$WITH_LIBELF" = "no" ]; then \
         arch=$(uname -m) && \
         cd $(mktemp -d) && \
-        curl -fsSL -O https://mirrors.kernel.org/mageia/distrib/6/${arch}/media/core/release/pmake-1.45-16.mga6.${arch}.rpm && \
-        curl -fsSL -O https://mirrors.kernel.org/mageia/distrib/6/${arch}/media/core/release/bmake-20161212-1.mga6.${arch}.rpm && \
+        curl -fsSL -O https://mirrors.kernel.org/mageia/distrib/7.1/${arch}/media/core/release/pmake-1.45-17.mga7.${arch}.rpm && \
+        curl -fsSL -O https://mirrors.kernel.org/mageia/distrib/7.1/${arch}/media/core/release/bmake-20181221-1.mga7.${arch}.rpm && \
         rpm -i *.rpm && \
         rm -rf $PWD \
     ; fi

mk/common.mk

@@ -44,7 +44,7 @@ getarch = $(shell [ -f /etc/debian_version ] && echo "amd64" || echo "x86_64")
 else ifeq ($(PLATFORM),ppc64le)
 getarch = $(shell [ -f /etc/debian_version ] && echo "ppc64el" || echo "ppc64le")
 else ifeq ($(PLATFORM),aarch64)
-getarch = $(shell [ -f /etc/debian_version ] && echo "arm64")
+getarch = $(shell [ -f /etc/debian_version ] && echo "arm64" || echo "aarch64")
 else
 $(error Unsupported architecture)
 endif

mk/elftoolchain.mk

@@ -36,6 +36,7 @@ $(SRCS_DIR)/.download_stamp:
 	$(MKDIR) -p $(SRCS_DIR)
 	$(CURL) --progress-bar -fSL $(URL) | \
 	$(TAR) -C $(SRCS_DIR) --strip-components=1 -xj $(addprefix $(PREFIX)/,mk common libelf)
+	$(CP) $(MAKE_DIR)/native-elf-format $(COMMON)
 	@touch $@
 
 $(SRCS_DIR)/.build_stamp: $(SRCS_DIR)/.download_stamp

mk/native-elf-format

@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# $Id: native-elf-format 3293 2016-01-07 19:26:27Z emaste $
+#
+# Find the native ELF format for a host platform by compiling a
+# test object and examining the resulting object.
+#
+# This script is used if there is no easy way to determine this
+# information statically at compile time.
+
+program=`basename $0`
+tmp_c=`mktemp -u nefXXXXXX`.c
+tmp_o=`echo ${tmp_c} | sed -e 's/.c$/.o/'`
+
+trap "rm -f ${tmp_c} ${tmp_o}"	0 1 2 3 15
+
+touch ${tmp_c}
+
+echo "/* Generated by ${program} on `date` */"
+
+cc -c ${tmp_c} -o ${tmp_o}
+LC_ALL=C readelf -h ${tmp_o} | awk '
+$1 ~ "Class:" {
+        sub("ELF","",$2); elfclass = $2;
+    }
+$1 ~ "Data:"  {
+        if (match($0, "little")) {
+            elfdata = "LSB";
+ 	} else {
+            elfdata = "MSB";
+	}
+    }
+$1 ~ "Machine:" {
+        if (match($0, "Intel.*386")) {
+            elfarch = "EM_386";
+        } else if (match($0, "MIPS")) {
+            elfarch = "EM_MIPS";
+        } else if (match($0, ".*[xX]86-64")) {
+            elfarch = "EM_X86_64";
+        } else if (match($0, "AArch64")) {
+            elfarch = "EM_X86_64";
+        } else {
+            elfarch = "unknown";
+        }
+    }
+END {
+    printf("#define	ELFTC_CLASS	ELFCLASS%s\n", elfclass);
+    printf("#define	ELFTC_ARCH	%s\n", elfarch);
+    printf("#define	ELFTC_BYTEORDER	ELFDATA2%s\n", elfdata);
+}'
+