From a69f9a3b65b5d33f603723a7ae56978dfbe02172 Mon Sep 17 00:00:00 2001
From: mortimer <mortimer@openbsd.org>
Date: Sat, 28 Jul 2018 21:43:21 +0000
Subject: [PATCH] Add -fno-ret-protector for arm64. Prompted by deraadt

---
 gnu/usr.bin/clang/Makefile.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/usr.bin/clang/Makefile.inc b/gnu/usr.bin/clang/Makefile.inc
index f772277db45..0b99edce43d 100644
--- a/gnu/usr.bin/clang/Makefile.inc
+++ b/gnu/usr.bin/clang/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.6 2018/06/06 00:14:29 mortimer Exp $
+# $OpenBSD: Makefile.inc,v 1.7 2018/07/28 21:43:21 mortimer Exp $
 
 LLVM_SRCS?=	${.CURDIR}/../../../llvm
 
@@ -20,7 +20,7 @@ CLANG_INCLUDES=	-I${LLVM_SRCS}/tools/clang/include
 CPPFLAGS+=	-I${LLVM_SRCS}/include -I${.CURDIR}/../include -I${.OBJDIR} \
 		-I${.OBJDIR}/../include
 CPPFLAGS+=	-DNDEBUG
-.if ${MACHINE} == "amd64"
+.if (${MACHINE} == "amd64" || ${MACHINE} == "arm64")
 CPPFLAGS+=	-fno-ret-protector
 .endif
 CPPFLAGS+=	-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS \
-- 
2.20.1