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 master updated. glibc-2.26.9000-889-gef5d8b4

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  ef5d8b4342dbeeb6b9e67df75c89251898150532 (commit)
      from  f938b397dd17265a1a005cd5786f197de1013e74 (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=ef5d8b4342dbeeb6b9e67df75c89251898150532

commit ef5d8b4342dbeeb6b9e67df75c89251898150532
Author: H.J. Lu <>
Date:   Thu Nov 30 16:33:59 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/ChangeLog b/ChangeLog
index 9f842e7..fc0bd3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-11-30  H.J. Lu  <>
+	* sysdeps/mips/dl-machine.h (elf_machine_reloc): Expand MIN.
 2017-11-30  Joseph Myers  <>
 	* sysdeps/m68k/coldfire/fpu/s_fabsf.c: Include
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:
 ChangeLog                 |    4 ++++
 sysdeps/mips/dl-machine.h |    3 ++-
 2 files changed, 6 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]