[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 7af7289 5/9: Merge from origin/emacs-26
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 7af7289 5/9: Merge from origin/emacs-26 |
Date: |
Sat, 1 Jun 2019 15:04:56 -0400 (EDT) |
branch: master
commit 7af7289e9eefc0ea61e55151d050929687b9456a
Merge: c6f4f5d b2e44b4
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Merge from origin/emacs-26
b2e44b4 Pacify GCC when compiling unexelf.c on Fedora 30
---
src/unexelf.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/unexelf.c b/src/unexelf.c
index c63a8d0..6d19bf1 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -304,6 +304,7 @@ unexec (const char *new_name, const char *old_name)
|| seg->p_vaddr > old_bss_seg->p_vaddr))
old_bss_seg = seg;
}
+ eassume (old_bss_seg);
/* Note that old_bss_addr may be lower than the first bss section
address, since the section may need aligning. */
- [Emacs-diffs] master updated (1860b6d -> 6028662), Glenn Morris, 2019/06/01
- [Emacs-diffs] master c6f4f5d 4/9: ; Merge from origin/emacs-26, Glenn Morris, 2019/06/01
- [Emacs-diffs] master cce8e42 2/9: ; Merge from origin/emacs-26, Glenn Morris, 2019/06/01
- [Emacs-diffs] master 5fb3782 8/9: ; Merge from origin/emacs-26, Glenn Morris, 2019/06/01
- [Emacs-diffs] master 2101b9d 3/9: Merge from origin/emacs-26, Glenn Morris, 2019/06/01
- [Emacs-diffs] master 7af7289 5/9: Merge from origin/emacs-26,
Glenn Morris <=
- [Emacs-diffs] master 6028662 9/9: Merge from origin/emacs-26, Glenn Morris, 2019/06/01
- [Emacs-diffs] master f17e0e9 6/9: ; Merge from origin/emacs-26, Glenn Morris, 2019/06/01
- [Emacs-diffs] master 7e911d0 7/9: Merge from origin/emacs-26, Glenn Morris, 2019/06/01
- [Emacs-diffs] master 17a1dae 1/9: Merge from origin/emacs-26, Glenn Morris, 2019/06/01