From 4fc40722403a0e88a35764b676819cba3a0e821c Mon Sep 17 00:00:00 2001
From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Tue, 26 Apr 2022 15:29:04 +0100
Subject: [PATCH] aarch64: morello: Use separate lp64 and morello sysdep
 directories

Provide separate directories for lp64 and purecap abi related sysdep
functionality.

purecap may be better name than morello, but we started with morello
and that is more future compatible with alternative cheri-like
extensions on top of aarch64.
---
 sysdeps/aarch64/preconfigure | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sysdeps/aarch64/preconfigure b/sysdeps/aarch64/preconfigure
index d9bd1f8558a..4d9d1376228 100644
--- a/sysdeps/aarch64/preconfigure
+++ b/sysdeps/aarch64/preconfigure
@@ -1,6 +1,11 @@
 case "$machine" in
 aarch64*)
 	base_machine=aarch64
-	machine=aarch64
+	if $CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null | grep -q __CHERI_PURE_CAPABILITY__
+	then
+		machine=aarch64/morello
+	else
+		machine=aarch64/lp64
+	fi
 	;;
 esac
-- 
2.47.2