New ARI warning Mon Aug 20 01:56:35 UTC 2018
Commit Message
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 <simon.marchi@polymtl.ca>
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(-)
@@ -1,3 +1,7 @@
+2018-08-19 Simon Marchi <simon.marchi@polymtl.ca>
+
+ * solib-svr4.c (svr4_exec_displacement): Fix formatting.
+
2018-08-19 Michael Spang <spang@google.com>
PR gdb/11786
@@ -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;