From 27c94b586cb1692c93a5efc17a636735a3176ffe Mon Sep 17 00:00:00 2001
From: Arthur Heymans <arthur@aheymans.xyz>
Date: Fri, 4 Nov 2022 20:27:11 +0100
Subject: [PATCH] util/xcompile: Fix building for clang + 64bit

-malign-abi does not exist on clang (v15.0.0) and the -ccc-gcc-name
variable is not needed anymore.

TESTED: This also boots on qemu q35

Change-Id: I7f99ebea18d5c09fdc7ced5c793d57d6fedd2e47
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69232
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin L Roth <gaumless@gmail.com>
---
 util/xcompile/xcompile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index e35904fde1..e6d312327b 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -235,6 +235,13 @@ GCC_CFLAGS_${TARCH}+=-fno-delete-null-pointer-checks -Wlogical-op
 GCC_ADAFLAGS_${TARCH}:=${FLAGS_GCC}
 GCC_COMPILER_RT_${TARCH}:=${CC_RT_GCC}
 GCC_COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_GCC}
+EOF
+if [ "${TARCH}" = "x86_64" ]; then
+cat <<EOF
+	GCC_CFLAGS_${TARCH} += -malign-data=abi
+EOF
+fi
+cat <<EOF
 
 # Clang
 CLANG_CC_${TARCH}:=${CLANG}
@@ -270,7 +277,7 @@ EOF
 # to use i586 instead.
 if [ "${TARCH}" = "x86_64" ]; then
 cat <<EOF
-	CFLAGS_${TARCH} += -march=nocona -malign-data=abi
+	CFLAGS_${TARCH} += -march=nocona
 EOF
 fi
 
@@ -459,7 +466,7 @@ test_architecture() {
 		# but that's more of a clang limitation. Let's be optimistic
 		# that this will change in the future.
 		CLANG="${clang_prefix}clang"
-		CFLAGS_CLANG="-target ${clang_arch}-${TABI} $CFLAGS_CLANG -ccc-gcc-name ${GCC}"
+		CFLAGS_CLANG="-target ${clang_arch}-${TABI} $CFLAGS_CLANG"
 	fi
 }