CVS commit: pkgsrc/mk

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug  1 07:58:21 UTC 2022

Modified Files:
        pkgsrc/mk: bsd.prefs.mk
        pkgsrc/mk/compiler: gcc.mk
        pkgsrc/mk/defaults: mk.conf

Log Message:
mk: add stack-clash option to PKGSRC_USE_STACK_CHECK


To generate a diff of this commit:
cvs rdiff -u -r1.424 -r1.425 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -u -r1.245 -r1.246 pkgsrc/mk/compiler/gcc.mk
cvs rdiff -u -r1.334 -r1.335 pkgsrc/mk/defaults/mk.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/bsd.prefs.mk
diff -u pkgsrc/mk/bsd.prefs.mk:1.424 pkgsrc/mk/bsd.prefs.mk:1.425
--- pkgsrc/mk/bsd.prefs.mk:1.424        Fri Jul 22 09:27:01 2022
+++ pkgsrc/mk/bsd.prefs.mk      Mon Aug  1 07:58:21 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.424 2022/07/22 09:27:01 nia Exp $
+# $NetBSD: bsd.prefs.mk,v 1.425 2022/08/01 07:58:21 wiz Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -855,7 +855,11 @@ _PKGSRC_USE_STACK_CHECK=no
 .if ${PKGSRC_USE_STACK_CHECK:tl} != "no" && \
     ${STACK_CHECK_SUPPORTED:Uyes:tl} == "yes" && \
     ${_OPSYS_SUPPORTS_STACK_CHECK:Uno} == "yes"
+.  if ${PKGSRC_USE_STACK_CHECK:tl} == "stack-clash"
+_PKGSRC_USE_STACK_CHECK=stack-clash
+.  else
 _PKGSRC_USE_STACK_CHECK=yes
+.  endif
 .endif
 
 # Enable CTF conversion if the user requested it, the OPSYS supports it, there

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.245 pkgsrc/mk/compiler/gcc.mk:1.246
--- pkgsrc/mk/compiler/gcc.mk:1.245     Thu Jul  7 16:23:39 2022
+++ pkgsrc/mk/compiler/gcc.mk   Mon Aug  1 07:58:21 2022
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.245 2022/07/07 16:23:39 jperkin Exp $
+# $NetBSD: gcc.mk,v 1.246 2022/08/01 07:58:21 wiz Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -443,9 +443,11 @@ _RELRO_LDFLAGS=            -Wl,-zrelro
 _RELRO_LDFLAGS+=       -Wl,-z,common-page-size=0x10000
 .endif
 
-_STACK_CHECK_CFLAGS=   -fstack-check
-
 .if ${_PKGSRC_USE_STACK_CHECK} == "yes"
+_STACK_CHECK_CFLAGS=   -fstack-check
+_GCC_CFLAGS+=          ${_STACK_CHECK_CFLAGS}
+.elif ${_PKGSRC_USE_STACK_CHECK} == "stack-clash"
+_STACK_CHECK_CFLAGS=   -fstack-clash-protection
 _GCC_CFLAGS+=          ${_STACK_CHECK_CFLAGS}
 .endif
 

Index: pkgsrc/mk/defaults/mk.conf
diff -u pkgsrc/mk/defaults/mk.conf:1.334 pkgsrc/mk/defaults/mk.conf:1.335
--- pkgsrc/mk/defaults/mk.conf:1.334    Tue Jun  7 10:04:25 2022
+++ pkgsrc/mk/defaults/mk.conf  Mon Aug  1 07:58:21 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.334 2022/06/07 10:04:25 jperkin Exp $
+# $NetBSD: mk.conf,v 1.335 2022/08/01 07:58:21 wiz Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -305,8 +305,9 @@ PKGSRC_USE_SSP?= strong
 PKGSRC_USE_STACK_CHECK?= no
 # Configure this to enable stack boundary verification (on supported platforms).
 # Possible values:
-#      no:     Do not pass any stack protection flags
-#      yes:    Pass -fstack-check
+#      no:               Do not pass any stack protection flags
+#      yes:              Pass -fstack-check
+#      clash-protection: Pass -fstack-clash-protection
 # Default: no
 
 # The default PREFER_PKGSRC should be empty, but due to historical reasons we have the list below.