From patchwork Mon Aug 20 02:06:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 28967 Received: (qmail 56560 invoked by alias); 20 Aug 2018 02:06:32 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 56218 invoked by uid 89); 20 Aug 2018 02:06:32 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy=administrator, Administrator X-HELO: simark.ca Received: from simark.ca (HELO simark.ca) (158.69.221.121) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 20 Aug 2018 02:06:30 +0000 Received: from [10.0.0.11] (unknown [192.222.164.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id C4B2F1E995; Sun, 19 Aug 2018 22:06:28 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=simark.ca; s=mail; t=1534730788; bh=tLn/Z1hjbhWFqfPRT1oOlNsE9L98oxcVZPEF5Qzsslg=; h=Subject:To:References:From:Date:In-Reply-To:From; b=pvpBeD6eEW+pU3S+mlMh2YSJxPxlYx6LIZMS/ttuXTPjwGWDqSjlLDKWaVA+Ljd2w kmgNf6lbOrMzgk/dOYgut1VTtN1rKUzh/H9bCZvm7vRNlzvdwTdBCh4ikaQPPSrzBB W3cpnr3JL5R6HB8nH7daleCzxgEAwptM4Bqgeh/Q= Subject: Re: New ARI warning Mon Aug 20 01:56:35 UTC 2018 To: GDB Administrator , gdb-patches@sourceware.org References: <20180820015635.GA112486@sourceware.org> From: Simon Marchi Message-ID: Date: Sun, 19 Aug 2018 22:06:28 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 In-Reply-To: <20180820015635.GA112486@sourceware.org> On 2018-08-19 9:56 p.m., GDB Administrator wrote: > 542a543,544 >> gdb/solib-svr4.c:2714: code: OP eol: Do not use &&, or || at the end of a line > gdb/solib-svr4.c:2714: if (phdr2[i].p_type == PT_GNU_RELRO || >> gdb/solib-svr4.c:2847: code: OP eol: Do not use &&, or || at the end of a line > gdb/solib-svr4.c:2847: if (phdr2[i].p_type == PT_GNU_RELRO || > Woops. Fixed it with: From c44deb735ef492f8799cbb35c5f2566fc2dba19d Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sun, 19 Aug 2018 22:03:58 -0400 Subject: [PATCH] Fix formatting in solib-svr4.c Fix some formatting issues which I have missed during review. gdb/ChangeLog: * solib-svr4.c (svr4_exec_displacement): Fix formatting. --- gdb/ChangeLog | 4 ++++ gdb/solib-svr4.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cb87cee4e72a..ff4d1cb54834 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2018-08-19 Simon Marchi + + * solib-svr4.c (svr4_exec_displacement): Fix formatting. + 2018-08-19 Michael Spang PR gdb/11786 diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index 84589509ef9f..29d07312becb 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -2711,8 +2711,8 @@ svr4_exec_displacement (CORE_ADDR *displacementp) CentOS-5 has problems with filesz, memsz as well. Strip also modifies memsz of PT_TLS. See PR 11786. */ - if (phdr2[i].p_type == PT_GNU_RELRO || - phdr2[i].p_type == PT_TLS) + if (phdr2[i].p_type == PT_GNU_RELRO + || phdr2[i].p_type == PT_TLS) { Elf32_External_Phdr tmp_phdr = *phdrp; Elf32_External_Phdr tmp_phdr2 = *phdr2p; @@ -2844,8 +2844,8 @@ svr4_exec_displacement (CORE_ADDR *displacementp) CentOS-5 has problems with filesz, memsz as well. Strip also modifies memsz of PT_TLS. See PR 11786. */ - if (phdr2[i].p_type == PT_GNU_RELRO || - phdr2[i].p_type == PT_TLS) + if (phdr2[i].p_type == PT_GNU_RELRO + || phdr2[i].p_type == PT_TLS) { Elf64_External_Phdr tmp_phdr = *phdrp; Elf64_External_Phdr tmp_phdr2 = *phdr2p;