Add ppc64le support

Author: 3XX0

Makefile

@@ -36,20 +36,6 @@ export DEBUG_DIR   ?= $(CURDIR)/.debug
 
 include $(MAKE_DIR)/common.mk
 
-DATE     := $(shell date -u --iso-8601=minutes)
-REVISION := $(shell git rev-parse HEAD)
-COMPILER := $(realpath $(shell which $(CC)))
-
-ifeq ($(DATE),)
-$(error Invalid date format)
-endif
-ifeq ($(REVISION),)
-$(error Invalid commit hash)
-endif
-ifeq ($(COMPILER),)
-$(error Invalid compiler)
-endif
-
 ##### File definitions #####
 
 DOC_FILES    := $(CURDIR)/NOTICE \
@@ -94,11 +80,7 @@ BIN_SCRIPT   = $(SRCS_DIR)/cli/$(BIN_NAME).lds
 
 ##### Target definitions #####
 
-ifneq ($(wildcard /etc/debian_version),)
-ARCH    ?= amd64
-else
-ARCH    ?= x86_64
-endif
+ARCH    ?= $(call getarch)
 MAJOR   := $(call getdef,NVC_MAJOR,$(LIB_INCS))
 MINOR   := $(call getdef,NVC_MINOR,$(LIB_INCS))
 PATCH   := $(call getdef,NVC_PATCH,$(LIB_INCS))
@@ -185,6 +167,7 @@ $(BUILD_DEFS):
 	@printf '#define BUILD_COMPILER "%s " __VERSION__\n' '$(notdir $(COMPILER))' >>$(BUILD_DEFS)
 	@printf '#define BUILD_FLAGS    "%s"\n' '$(strip $(CPPFLAGS) $(CFLAGS) $(LDFLAGS))' >>$(BUILD_DEFS)
 	@printf '#define BUILD_REVISION "%s"\n' '$(strip $(REVISION))' >>$(BUILD_DEFS)
+	@printf '#define BUILD_PLATFORM "%s"\n' '$(strip $(PLATFORM))' >>$(BUILD_DEFS)
 
 $(LIB_RPC_SRCS): $(LIB_RPC_SPEC)
 	$(RM) $@

mk/common.mk

@@ -2,6 +2,8 @@
 # Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved.
 #
 
+##### Global definitions #####
+
 MV       ?= mv -f
 CP       ?= cp -a
 LN       ?= ln
@@ -15,4 +17,29 @@ OBJCPY   ?= objcopy
 RPCGEN   ?= rpcgen
 BMAKE    ?= MAKEFLAGS= bmake
 
+DATE     := $(shell date -u --iso-8601=minutes)
+REVISION := $(shell git rev-parse HEAD)
+COMPILER := $(realpath $(shell which $(CC)))
+PLATFORM ?= $(shell uname -p)
+
+ifeq ($(DATE),)
+$(error Invalid date format)
+endif
+ifeq ($(REVISION),)
+$(error Invalid commit hash)
+endif
+ifeq ($(COMPILER),)
+$(error Invalid compiler)
+endif
+
+##### Function definitions #####
+
 getdef = $(shell sed -n "0,/$(1)/s/\#define\s\+$(1)\s\+\(\w*\)/\1/p" $(2))
+
+ifeq ($(PLATFORM),x86_64)
+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
+$(error Unsupported architecture)
+endif

src/cli/main.c

@@ -57,6 +57,7 @@ print_version(FILE *stream, maybe_unused struct argp_state *state)
         fprintf(stream, "build date: %s\n", BUILD_DATE);
         fprintf(stream, "build revision: %s\n", BUILD_REVISION);
         fprintf(stream, "build compiler: %s\n", BUILD_COMPILER);
+        fprintf(stream, "build platform: %s\n", BUILD_PLATFORM);
         fprintf(stream, "build flags: %s\n", BUILD_FLAGS);
 }
 

src/common.h

@@ -34,6 +34,11 @@
 # define LIB32_ARCH               LD_I386_LIB32
 # define USR_LIB_MULTIARCH_DIR    "/usr/lib/x86_64-linux-gnu"
 # define USR_LIB32_MULTIARCH_DIR  "/usr/lib/i386-linux-gnu"
+#elif defined(__powerpc64__)
+# define LIB_ARCH                 LD_POWERPC_LIB64
+# define LIB32_ARCH               LD_UNKNOWN
+# define USR_LIB_MULTIARCH_DIR    "/usr/lib/powerpc64le-linux-gnu"
+# define USR_LIB32_MULTIARCH_DIR  "/var/empty"
 #else
 # error "unsupported architecture"
 #endif /* defined(__x86_64__) */

src/ldcache.h

@@ -19,6 +19,8 @@ struct ldcache {
 };
 
 enum {
+        LD_UNKNOWN                 = (uint32_t)-1,
+
         LD_TYPE_MASK               = 0x00ff,
         LD_ELF                     = 0x0001,
         LD_ELF_LIBC5               = 0x0002,

src/nvc.c

@@ -54,6 +54,7 @@ nvc_entrypoint(void)
         printf("build date: %s\n", BUILD_DATE);
         printf("build revision: %s\n", BUILD_REVISION);
         printf("build compiler: %s\n", BUILD_COMPILER);
+        printf("build platform: %s\n", BUILD_PLATFORM);
         printf("build flags: %s\n", BUILD_FLAGS);
         exit(EXIT_SUCCESS);
 }

src/options.h

@@ -59,7 +59,11 @@ enum {
         OPT_GRAPHICS_LIBS = 1 << 7,
         OPT_UTILITY_BINS  = 1 << 8,
         OPT_COMPUTE_BINS  = 1 << 9,
+#if defined(__powerpc64__) /* ppc64le doesn't support compat32. */
+        OPT_COMPAT32      = 1 << 0,
+#else
         OPT_COMPAT32      = 1 << 10,
+#endif /* defined(__powerpc64__) */
 };
 
 static const struct option container_opts[] = {