diff options
| author | Glenn Morris | 2019-06-01 12:04:42 -0700 |
|---|---|---|
| committer | Glenn Morris | 2019-06-01 12:04:42 -0700 |
| commit | 7af7289e9eefc0ea61e55151d050929687b9456a (patch) | |
| tree | a2ffdde8c45e1603bc0f2e1cc1fc6a82be686bec /src | |
| parent | c6f4f5debd9e229f31b947fbcd8aadc0b265360b (diff) | |
| parent | b2e44b42463bf80286063299dbb73d27a040372e (diff) | |
| download | emacs-7af7289e9eefc0ea61e55151d050929687b9456a.tar.gz emacs-7af7289e9eefc0ea61e55151d050929687b9456a.zip | |
Merge from origin/emacs-26
b2e44b4 Pacify GCC when compiling unexelf.c on Fedora 30
Diffstat (limited to 'src')
| -rw-r--r-- | src/unexelf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/unexelf.c b/src/unexelf.c index c63a8d03c22..6d19bf1fb9f 100644 --- a/src/unexelf.c +++ b/src/unexelf.c | |||
| @@ -304,6 +304,7 @@ unexec (const char *new_name, const char *old_name) | |||
| 304 | || seg->p_vaddr > old_bss_seg->p_vaddr)) | 304 | || seg->p_vaddr > old_bss_seg->p_vaddr)) |
| 305 | old_bss_seg = seg; | 305 | old_bss_seg = seg; |
| 306 | } | 306 | } |
| 307 | eassume (old_bss_seg); | ||
| 307 | 308 | ||
| 308 | /* Note that old_bss_addr may be lower than the first bss section | 309 | /* Note that old_bss_addr may be lower than the first bss section |
| 309 | address, since the section may need aligning. */ | 310 | address, since the section may need aligning. */ |