Makefiles: Simplify auto-derivation of compiler flags

This commit simplifies the logic around automatically
setting architecture-specific compiler flags from

```
  if (arch == A)
  {
     if (!cross)
        ...
     if (cross == X)
        ...
     elif (cross == Y)
        ...
  }
  elif (arch == B)
  {
     if (!cross)
        ...
     if (cross == X)
        ...
     elif (cross == Y)
        ...
  }
```

to

```
  if !cross
  {
     if (arch == A)
        ...
     elif (arch == B)
        ...
     ...
  }
  else {
     if (cross == X)
        ...
     elif (cross == Y)
        ...
  }
```

It also adds further architecture flags for RV64 and PPC64LE.

Signed-off-by: Hanno Becker <[email protected]>

Author: hanno-becker

examples/monolithic_build_multilevel_native/Makefile

@@ -52,36 +52,34 @@ BIN=test_binary
 
 # Automatically detect system architecture and set preprocessor etc accordingly
 HOST_PLATFORM := $(shell uname -s)-$(shell uname -m)
+
 # linux x86_64
 ifeq ($(HOST_PLATFORM),Linux-x86_64)
 	CFLAGS += -z noexecstack
 endif
 
-ifeq ($(HOST_PLATFORM),Linux-x86_64)
+# Native compilation
 ifeq ($(CROSS_PREFIX),)
+ifeq ($(HOST_PLATFORM),Linux-x86_64)
 	CFLAGS += -mavx2 -mbmi2 -mpopcnt -maes
 	CFLAGS += -DMLK_FORCE_X86_64
-else ifneq ($(findstring aarch64_be, $(CROSS_PREFIX)),)
-	CFLAGS += -DMLK_FORCE_AARCH64_EB
-else ifneq ($(findstring aarch64, $(CROSS_PREFIX)),)
-	CFLAGS += -DMLK_FORCE_AARCH64
-else
-
-endif
-
-# linux aarch64
 else ifeq ($(HOST_PLATFORM),Linux-aarch64)
-ifeq ($(CROSS_PREFIX),)
 	CFLAGS += -DMLK_FORCE_AARCH64
+else ifeq ($(HOST_PLATFORM),Darwin-arm64)
+	CFLAGS += -DMLK_FORCE_AARCH64
+endif
+# Cross compilation
 else ifneq ($(findstring x86_64, $(CROSS_PREFIX)),)
 	CFLAGS += -mavx2 -mbmi2 -mpopcnt -maes
 	CFLAGS += -DMLK_FORCE_X86_64
-else
-endif
-
-# darwin aarch64
-else ifeq ($(HOST_PLATFORM),Darwin-arm64)
+else ifneq ($(findstring aarch64_be, $(CROSS_PREFIX)),)
+	CFLAGS += -DMLK_FORCE_AARCH64_EB
+else ifneq ($(findstring aarch64, $(CROSS_PREFIX)),)
 	CFLAGS += -DMLK_FORCE_AARCH64
+else ifneq ($(findstring riscv64, $(CROSS_PREFIX)),)
+	CFLAGS += -DMLK_FORCE_RISCV64
+else ifneq ($(findstring powerpc64le, $(CROSS_PREFIX)),)
+	CFLAGS += -DMLK_FORCE_PPC64LE
 endif
 
 CFLAGS := \

examples/multilevel_build_native/Makefile

@@ -14,36 +14,34 @@ endif
 
 # Automatically detect system architecture and set preprocessor etc accordingly
 HOST_PLATFORM := $(shell uname -s)-$(shell uname -m)
+
 # linux x86_64
 ifeq ($(HOST_PLATFORM),Linux-x86_64)
 	CFLAGS += -z noexecstack
 endif
 
-ifeq ($(HOST_PLATFORM),Linux-x86_64)
+# Native compilation
 ifeq ($(CROSS_PREFIX),)
+ifeq ($(HOST_PLATFORM),Linux-x86_64)
 	CFLAGS += -mavx2 -mbmi2 -mpopcnt -maes
 	CFLAGS += -DMLK_FORCE_X86_64
-else ifneq ($(findstring aarch64_be, $(CROSS_PREFIX)),)
-	CFLAGS += -DMLK_FORCE_AARCH64_EB
-else ifneq ($(findstring aarch64, $(CROSS_PREFIX)),)
-	CFLAGS += -DMLK_FORCE_AARCH64
-else
-
-endif
-
-# linux aarch64
 else ifeq ($(HOST_PLATFORM),Linux-aarch64)
-ifeq ($(CROSS_PREFIX),)
 	CFLAGS += -DMLK_FORCE_AARCH64
+else ifeq ($(HOST_PLATFORM),Darwin-arm64)
+	CFLAGS += -DMLK_FORCE_AARCH64
+endif
+# Cross compilation
 else ifneq ($(findstring x86_64, $(CROSS_PREFIX)),)
 	CFLAGS += -mavx2 -mbmi2 -mpopcnt -maes
 	CFLAGS += -DMLK_FORCE_X86_64
-else
-endif
-
-# darwin aarch64
-else ifeq ($(HOST_PLATFORM),Darwin-arm64)
+else ifneq ($(findstring aarch64_be, $(CROSS_PREFIX)),)
+	CFLAGS += -DMLK_FORCE_AARCH64_EB
+else ifneq ($(findstring aarch64, $(CROSS_PREFIX)),)
 	CFLAGS += -DMLK_FORCE_AARCH64
+else ifneq ($(findstring riscv64, $(CROSS_PREFIX)),)
+	CFLAGS += -DMLK_FORCE_RISCV64
+else ifneq ($(findstring powerpc64le, $(CROSS_PREFIX)),)
+	CFLAGS += -DMLK_FORCE_PPC64LE
 endif
 
 CFLAGS := \

test/mk/auto.mk

@@ -1,36 +1,27 @@
 # SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT
 #
 # Automatically detect system architecture and set preprocessor etc accordingly
-ifeq ($(HOST_PLATFORM),Linux-x86_64)
+
+# Native compilation
 ifeq ($(CROSS_PREFIX),)
+ifeq ($(HOST_PLATFORM),Linux-x86_64)
 	CFLAGS += -mavx2 -mbmi2 -mpopcnt -maes
 	CFLAGS += -DMLK_FORCE_X86_64
-else ifneq ($(findstring aarch64_be, $(CROSS_PREFIX)),)
-	CFLAGS += -DMLK_FORCE_AARCH64_EB
-else ifneq ($(findstring aarch64, $(CROSS_PREFIX)),)
-	CFLAGS += -DMLK_FORCE_AARCH64
-else
-
-endif
-
-# linux aarch64
 else ifeq ($(HOST_PLATFORM),Linux-aarch64)
-ifeq ($(CROSS_PREFIX),)
 	CFLAGS += -DMLK_FORCE_AARCH64
-else ifneq ($(findstring x86_64, $(CROSS_PREFIX)),)
-	CFLAGS += -mavx2 -mbmi2 -mpopcnt -maes
-	CFLAGS += -DMLK_FORCE_X86_64
-else
-endif
-
-# darwin aarch64
 else ifeq ($(HOST_PLATFORM),Darwin-arm64)
-ifeq ($(CROSS_PREFIX),)
 	CFLAGS += -DMLK_FORCE_AARCH64
+endif
+# Cross compilation
 else ifneq ($(findstring x86_64, $(CROSS_PREFIX)),)
+	CFLAGS += -mavx2 -mbmi2 -mpopcnt -maes
 	CFLAGS += -DMLK_FORCE_X86_64
+else ifneq ($(findstring aarch64_be, $(CROSS_PREFIX)),)
+	CFLAGS += -DMLK_FORCE_AARCH64_EB
 else ifneq ($(findstring aarch64, $(CROSS_PREFIX)),)
 	CFLAGS += -DMLK_FORCE_AARCH64
-else
-endif
+else ifneq ($(findstring riscv64, $(CROSS_PREFIX)),)
+	CFLAGS += -DMLK_FORCE_RISCV64
+else ifneq ($(findstring powerpc64le, $(CROSS_PREFIX)),)
+	CFLAGS += -DMLK_FORCE_PPC64LE
 endif