This is the mail archive of the mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch hjl/pie/static updated. glibc-2.26.9000-879-gfa5cd7f

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, hjl/pie/static has been updated
       via  fa5cd7f61b200aa54471fff53266ec28b5faf71f (commit)
      from  951b8ac9a2dd6a4a36b939b1e1f47013740e07d8 (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 -----------------------------------------------------------------;a=commitdiff;h=fa5cd7f61b200aa54471fff53266ec28b5faf71f

commit fa5cd7f61b200aa54471fff53266ec28b5faf71f
Author: H.J. Lu <>
Date:   Thu Nov 30 14:45:06 2017 -0800

    mips: Don't use MIN in dl-machine.h
    MIN is used, but param.h may not be included, so expand its single use
    	* sysdeps/mips/dl-machine.h (elf_machine_reloc): Expand MIN.

diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h
index da9d633..904824b 100644
--- a/sysdeps/mips/dl-machine.h
+++ b/sysdeps/mips/dl-machine.h
@@ -695,7 +695,8 @@ elf_machine_reloc (struct link_map *map, ElfW(Addr) r_info,
 			      RTLD_PROGNAME, strtab + refsym->st_name);
 	memcpy (reloc_addr, (void *) value,
-		MIN (sym->st_size, refsym->st_size));
+		sym->st_size < refsym->st_size
+		? sym->st_size : refsym->st_size);


Summary of changes:
 sysdeps/mips/dl-machine.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

GNU C Library master sources

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]