Patchwork aarch64: define MIN in dl-machine.h

login
register
mail settings
Submitter Szabolcs Nagy
Date Oct. 4, 2017, 11:35 a.m.
Message ID <59D4C786.8010506@arm.com>
Download mbox | patch
Permalink /patch/23322/
State New
Headers show

Comments

Szabolcs Nagy - Oct. 4, 2017, 11:35 a.m.
MIN is used, but param.h may not be included. Define MIN explicitly
because param.h has lots of legacy macro definitions so it should
not be used.

(needed for hjl/pie/static branch)
(will commit this soon)

2017-10-04  Szabolcs Nagy  <szabolcs.nagy@arm.com>

	* sysdeps/aarch64/dl-machine.h (MIN): Define.
Andreas Schwab - Oct. 4, 2017, 12:59 p.m.
There is only one use of MIN, perhaps expand it there?

Andreas.

Patch

diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h
index 60472036f5..d53a8be235 100644
--- a/sysdeps/aarch64/dl-machine.h
+++ b/sysdeps/aarch64/dl-machine.h
@@ -27,6 +27,10 @@ 
 #include <dl-irel.h>
 #include <cpu-features.c>
 
+#ifndef MIN
+# define MIN(a,b) (((a)<(b))?(a):(b))
+#endif
+
 /* Return nonzero iff ELF header is compatible with the running host.  */
 static inline int __attribute__ ((unused))
 elf_machine_matches_host (const ElfW(Ehdr) *ehdr)