From patchwork Sun Jul 9 15:42:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 21481 Received: (qmail 54168 invoked by alias); 9 Jul 2017 15:42:40 -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 54144 invoked by uid 89); 9 Jul 2017 15:42:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=H*Ad:D*oracle.com X-HELO: mail-pf0-f173.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=uRDtWJTXojJRCEYiodEmGtI1fAtyLp6/Xi+Al+uzqdk=; b=A1J6NT7f99QL3Fn0pvkjtBj1jnNCOfsx402TciGZDPtTaEVwDzuHksDVUvOCtRWwux 8BP51n76gkSnOjdFxpSy3qsCNtNNlixB3ScrrPcUiuzN7OgcoNaDOSadws8c7R+FD4rs hgHYOJtAa+1mkIJ6iTmXTnevP1Pv40DDNu6gBfZRLal2DAhJGq+cEvrCoWVAhpvhsFTT T/ZCJ5aLd1y1hp6FFzTd558/i8e5cEWqkYVEsQFi2XLWZ4CM2ybmzlKP0zmzqHxPQH1g Uznv8h5polCQ7oe2x8jV1yf8dP079IuI13cIiV4bfIn3VqoOk/mXm54Fc0eydn0RVJjR Uc0Q== X-Gm-Message-State: AIVw111BYUXJuXdCG+QsCfg6LATT6b2x+DUcd/mdmXe6X/0GldzDtwpb D8ICV+ma2RFQuQ== X-Received: by 10.99.44.206 with SMTP id s197mr10648399pgs.116.1499614955418; Sun, 09 Jul 2017 08:42:35 -0700 (PDT) Date: Sun, 9 Jul 2017 08:42:33 -0700 From: "H.J. Lu" To: GNU C Library Cc: Nick Alcock Subject: [PATCH] Remove debug/stack_chk_fail_local.c [BZ #21740] Message-ID: <20170709154233.GA10935@gmail.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.8.3 (2017-05-23) Since commit 524a8ef2ad76af8ac049293d993a1856b0d888fb Author: Nick Alcock Date: Mon Dec 26 10:08:57 2016 +0100 PLT avoidance for __stack_chk_fail [BZ #7065] Add a hidden __stack_chk_fail_local alias to libc.so, and make sure that on targets which use __stack_chk_fail, this does not introduce a local PLT reference into libc.so. added strong_alias (__stack_chk_fail, __stack_chk_fail_local) to debug/stack_chk_fail.c, debug/stack_chk_fail_local.c should be removed. OK for master? H.J. --- * [BZ #21740] * debug/Makefile (static-only-routines): Remove stack_chk_fail_local. * debug/stack_chk_fail_local.c: Removed. --- debug/Makefile | 2 +- debug/stack_chk_fail_local.c | 46 -------------------------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 debug/stack_chk_fail_local.c diff --git a/debug/Makefile b/debug/Makefile index cd4975c..136c9a1 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -51,7 +51,7 @@ routines = backtrace backtracesyms backtracesymsfd noophooks \ explicit_bzero_chk \ stack_chk_fail fortify_fail \ $(static-only-routines) -static-only-routines := warning-nop stack_chk_fail_local +static-only-routines := warning-nop # Building the stack-protector failure routines with stack protection # makes no sense. diff --git a/debug/stack_chk_fail_local.c b/debug/stack_chk_fail_local.c deleted file mode 100644 index eb0a759..0000000 --- a/debug/stack_chk_fail_local.c +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright (C) 2005-2017 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - In addition to the permissions in the GNU Lesser General Public - License, the Free Software Foundation gives you unlimited - permission to link the compiled version of this file with other - programs, and to distribute those programs without any restriction - coming from the use of this file. (The GNU Lesser General Public - License restrictions do apply in other respects; for example, they - cover modification of the file, and distribution when not linked - into another program.) - - Note that people who make modified versions of this file are not - obligated to grant this special exception for their modified - versions; it is their choice whether to do so. The GNU Lesser - General Public License gives permission to release a modified - version without this exception; this exception also makes it - possible to release a modified version which carries forward this - exception. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include - -extern void __stack_chk_fail (void) __attribute__ ((noreturn)); - -/* On some architectures, this helps needless PIC pointer setup - that would be needed just for the __stack_chk_fail call. */ - -void __attribute__ ((noreturn)) attribute_hidden -__stack_chk_fail_local (void) -{ - __stack_chk_fail (); -}