Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 15 Jul 2024 12:38:30 GMT
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: fa84eb9cfb7e - stable/13 - sys: Build arm64 per-thread SSP with GCC
Message-ID:  <202407151238.46FCcUbV061737@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=fa84eb9cfb7e3745d09e6745bfe15f54f2f36b0b

commit fa84eb9cfb7e3745d09e6745bfe15f54f2f36b0b
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2024-05-22 08:20:01 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-07-15 12:34:29 +0000

    sys: Build arm64 per-thread SSP with GCC
    
    It has been supported since GCC 9. It is unlikely anything older than
    that will build the kernel so mark it as supported by GCC.
    
    Reviewed by:    brooks, jhb
    Sponsored by:   Arm Ltd
    Differential Revision:  https://reviews.freebsd.org/D45267
    
    (cherry picked from commit c2628accc029a07eb8ff73b6df7f7d6af194ca2d)
---
 sys/conf/Makefile.arm64 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/conf/Makefile.arm64 b/sys/conf/Makefile.arm64
index 3a2f2ba6362d..9ec7d7983480 100644
--- a/sys/conf/Makefile.arm64
+++ b/sys/conf/Makefile.arm64
@@ -31,7 +31,8 @@ CFLAGS += -DLINUX_DTS_VERSION=\"${LINUX_DTS_VERSION}\"
 
 PERTHREAD_SSP_ENABLED!=	grep PERTHREAD_SSP opt_global.h || true ; echo
 .if !empty(PERTHREAD_SSP_ENABLED)
-. if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 130000
+. if (${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 130000) || \
+  ${COMPILER_TYPE} == "gcc"
 ARM64_SSP_CFLAGS = -mstack-protector-guard=sysreg
 ARM64_SSP_CFLAGS += -mstack-protector-guard-reg=sp_el0
 ARM64_SSP_CFLAGS += -mstack-protector-guard-offset=0



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407151238.46FCcUbV061737>