This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.26-516-gdb4f87b
- From: nsz at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 4 Oct 2017 16:50:39 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.26-516-gdb4f87b
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via db4f87bad48ed93ae14f61121367a7cb94fa46ed (commit)
from 32d372d548122b224ec63a520a780d9227094a48 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=db4f87bad48ed93ae14f61121367a7cb94fa46ed
commit db4f87bad48ed93ae14f61121367a7cb94fa46ed
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Wed Oct 4 11:09:33 2017 +0100
aarch64: don't use MIN in dl-machine.h
MIN is used, but param.h may not be included, so expand its
single use inline.
* sysdeps/aarch64/dl-machine.h (elf_machine_rela): Expand MIN.
diff --git a/ChangeLog b/ChangeLog
index 9a4a016..23f2595 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-10-04 Szabolcs Nagy <szabolcs.nagy@arm.com>
+
+ * sysdeps/aarch64/dl-machine.h (elf_machine_rela): Expand MIN.
+
2017-10-04 Joseph Myers <joseph@codesourcery.com>
[BZ #22229]
diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h
index 6047203..b124547 100644
--- a/sysdeps/aarch64/dl-machine.h
+++ b/sysdeps/aarch64/dl-machine.h
@@ -312,7 +312,8 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
RTLD_PROGNAME, strtab + refsym->st_name);
}
memcpy (reloc_addr_arg, (void *) value,
- MIN (sym->st_size, refsym->st_size));
+ sym->st_size < refsym->st_size
+ ? sym->st_size : refsym->st_size);
break;
case AARCH64_R(RELATIVE):
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
sysdeps/aarch64/dl-machine.h | 3 ++-
2 files changed, 6 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources