From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Sat, 27 Aug 2022 11:38:11 +0000 (+0100)
Subject: git-machrules-chk_fail
X-Git-Tag: archive/raspbian/2.34-7+rpi1~1^2~89
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4790ce508d23c8970ffd0b5a7dcd98513ab77d3f;p=glibc.git

git-machrules-chk_fail

Committed for 2.35

commit cf44f08379c667116c505a5060c770d7712e6812
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Tue Dec 14 01:01:48 2021 +0100

    mach: Fix spurious inclusion of stack_chk_fail_local in libmachuser.a

    When linking programs statically, stack_chk_fail_local already comes
    from libc_nonshared, so we don't need it in lib{mach,hurd}user.a.


Gbp-Pq: Topic hurd-i386
Gbp-Pq: Name git-machrules-chk_fail.diff
---

diff --git a/mach/Machrules b/mach/Machrules
index 583937800..ebb0fabd7 100644
--- a/mach/Machrules
+++ b/mach/Machrules
@@ -223,6 +223,7 @@ endif
 ifdef interface-library
 
 $(interface-library)-routines = $(interface-routines) stack_chk_fail_local
+$(interface-library)-shared-only-routines = stack_chk_fail_local
 extra-libs += $(interface-library)
 extra-libs-others += $(interface-library)