From patchwork Sun Aug 27 20:12:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 806302 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-83764-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="wIu5tAF+"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xgR0Y5Zzwz9s8V for ; Mon, 28 Aug 2017 06:13:01 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=UDROizPsQlLN9toMNSbk++JxkfUIz hps36Vo2QZN284mKg0WQgv9ffzeM8nBcb6TtWEh9f7VWEwZO86TpxVMl5+TQXl/W vcv4UmsPQ99hKL3WwDuwco4S2uSu70ZHn49QZ+9p46Zus3AL9Uai3mCCPuNNCP2r v0GzlXfnnjkuDM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=rQNDI6w06JA2kqLGiF2l6m04ZRs=; b=wIu 5tAF+NGdEwnvjJqquL3hZ6q2flE3r4nDQrRFwMkwppw5yN5Lj9HkEAkR+AF5BEef AQres7x0GEXebmBPaoGHErUjI+POK6j5qrQvRaU4O+3nV+uM6hnSbkl2Ai8TRLd/ zh32U1kDQk0Y8aHRLPybiOYhtBx/Vym0GiLpfJI0= Received: (qmail 28117 invoked by alias); 27 Aug 2017 20:12:55 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 22288 invoked by uid 89); 27 Aug 2017 20:12:50 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: hera.aquilenet.fr Date: Sun, 27 Aug 2017 22:12:45 +0200 From: Samuel Thibault To: libc-alpha@sourceware.org Subject: [hurd,commited] hurd: fix build with -fstack-protector-strong libmachuser and libhurduser also need stack_chk_fail_local and they do not link against libc_nonshared. * mach/stack_chk_fail_local.c: New file. * hurd/stack_chk_fail_local.c: New file. * mach/Machrules ($(interface-library)-routines): Add stack_chk_fail_local. * mach/Versions (GLIBC_2.4): Add __stack_chk_fail. * hurd/Versions (GLIBC_2.4): Add __stack_chk_fail. Message-ID: <20170827201245.g5tfjijpxgmgufqz@var.youpi.perso.aquilenet.fr> MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20170113 (1.7.2) diff --git a/ChangeLog b/ChangeLog index 1b0f15573a..4d94fee93b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ 2017-08-27 Samuel Thibault * sysdeps/mach/hurd/bits/sysmacros.h: New file. + * mach/stack_chk_fail_local.c: New file. + * hurd/stack_chk_fail_local.c: New file. + * mach/Machrules ($(interface-library)-routines): Add + stack_chk_fail_local. + * mach/Versions (GLIBC_2.4): Add __stack_chk_fail. + * hurd/Versions (GLIBC_2.4): Add __stack_chk_fail. 2017-08-25 H.J. Lu diff --git a/hurd/Versions b/hurd/Versions index 77f5b4271e..011edc7384 100644 --- a/hurd/Versions +++ b/hurd/Versions @@ -129,6 +129,10 @@ libc { # functions used in macros & inline functions __errno_location; } + GLIBC_2.4 { + # functions used by RPC stubs + __stack_chk_fail + } HURD_CTHREADS_0.3 { # weak refs to libthreads functions that libc calls iff libthreads in use diff --git a/hurd/stack_chk_fail_local.c b/hurd/stack_chk_fail_local.c new file mode 100644 index 0000000000..305871fbc0 --- /dev/null +++ b/hurd/stack_chk_fail_local.c @@ -0,0 +1 @@ +#include diff --git a/mach/Machrules b/mach/Machrules index 36adfc7681..29114b1eef 100644 --- a/mach/Machrules +++ b/mach/Machrules @@ -221,7 +221,7 @@ endif ifdef interface-library -$(interface-library)-routines = $(interface-routines) +$(interface-library)-routines = $(interface-routines) stack_chk_fail_local extra-libs += $(interface-library) extra-libs-others += $(interface-library) diff --git a/mach/Versions b/mach/Versions index 0097aad59b..b22fda4cf4 100644 --- a/mach/Versions +++ b/mach/Versions @@ -54,6 +54,10 @@ libc { # This was always there, but not exported as it should have been. mig_strncpy; } + GLIBC_2.4 { + # functions used by RPC stubs + __stack_chk_fail + } GLIBC_2.23 { __mach_host_self_; } diff --git a/mach/stack_chk_fail_local.c b/mach/stack_chk_fail_local.c new file mode 100644 index 0000000000..305871fbc0 --- /dev/null +++ b/mach/stack_chk_fail_local.c @@ -0,0 +1 @@ +#include