From patchwork Wed Oct 4 11:35:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 23322 Received: (qmail 68405 invoked by alias); 4 Oct 2017 11:35:43 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 68394 invoked by uid 89); 4 Oct 2017 11:35:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy=HX-ClientProxiedBy:sk:AM5P194, Hx-languages-length:825 X-HELO: EUR03-DB5-obe.outbound.protection.outlook.com Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Szabolcs.Nagy@arm.com; Message-ID: <59D4C786.8010506@arm.com> Date: Wed, 04 Oct 2017 12:35:34 +0100 From: Szabolcs Nagy User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: GNU C Library CC: nd@arm.com Subject: [PATCH] aarch64: define MIN in dl-machine.h X-ClientProxiedBy: AM5P194CA0019.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::29) To VI1PR0802MB2493.eurprd08.prod.outlook.com (2603:10a6:800:b4::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2e0b562e-0987-42b9-8117-08d50b1c08e6 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(49563074)(201703131423075)(201703031133081)(201702281549075); SRVR:VI1PR0802MB2493; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0802MB2493; 3:TJBk5m9KRUBKkSPKyZw2KC6ySGFTo35LfrtropQqQYWuhernNPlbAGvEjTPHFr9nX1hDwT7GKxeFz8sLaSNIHwFZS5XgaG0x3MXowKLoKdw75HBlQ6qvw/IAE9mSLDgPQxZtJgUOIE1UqD5+bc3GuQWzRUNxmADBLfk9o6wwtrFDDsF7twrWz1HgeWIB/eJA2uHc8rphJHkBx/IVY0yVVO+FxiJLwpmZd9dX+AJI1ZzEvylZXUuatkjylAxKoXnW; 25:5uQtvLfwSVwKXhrUZDpUErl3yqEdj88MwotntgBUEXBod3fgYFxbIqij6yQSycqakm0zLIN+dscqdTgk6HIyWyWx++0K+sipVNP8FofWJ1REuu2+BHizC47xQX9QH2Fs5CbJcI1M3OKlfi9ni3ltclIDo0s6/zF9oisBgusRMgtnu2uepQ6wkxnygL6es2WQqTVFqaE5aKfCDNZGpET7KcI+OrAnfGU6uddF10NYPL+a/3DyopaDST9H0UAHlCQ4c243aMa6VnZvfHc5zHF4rB1Z3Ymf/6WYDkf3xXIuLh9ZEu7hnTNgSq4OrAGzLQZuYAfJ0y7L+bL6ZVc6wZu5YA==; 31:yDpnN3NN+AEV+NeSIKQ0i+wwNFJ5Z9ZjUlhPvz8rtibMCynHRmRShUd1X33AIS9jzCS6qrnX1EwvEjiojzb8pLzLkUCBGjw0+aNtjDzwAo9VAE6NfF/inWk5Nj0lJQyZ5HaaV89ygpzWBWKclq2EGgTTtexeMe+B5HL8m1OiXKfGKzzItvFjRtcCg0bqUcuEtsQbuAY90KWPtpmGSkCphYaSkTy2kw4XViOHhrk7Aro= X-MS-TrafficTypeDiagnostic: VI1PR0802MB2493: NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; VI1PR0802MB2493; 20:XtG91NUOgrUaoPNeaWIh2bqEFGajM4E41uuPDwDcThET0GV92QtfVa95SvHOvEhKdmbLKyYK+hdbMD9RvM2qGvRUNj+NyfeTDK/AqeVSt6DFJShC84vY8obz/+z03nFxpA/HDcsPUfkIaPY99EHiG4VMDKQEoe42YcJZwPf/4Wk=; 4:0TufTZWsHmEv5IM7RIQrXSAmlqH90za4DcqCeeqQxwBdVZri37Oq2PjrqZIwLA1kI+fifwh5PczP0OYyAM2ADLRNEUt08D7f7MZHwXduc10+rHFxmUvzzoHV6hacFoFQdt3LP3ouMwfXCPbbs0jNyv+MqIXADdG/kSdOQNcaqsYWJCfcBfRnUoLqC0osavLW6g6Dvc1UzCl6vElzl/qAsCuFVX0j712BBKYHZax7qTq24y1T1dvXiJnwvEr6r6+hVPqIDkwN7/qlJ/+YkdDb05yeNnQi0KBgMvtTqN2Yqq0= X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(102415395)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041248)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123564025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:VI1PR0802MB2493; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:VI1PR0802MB2493; X-Forefront-PRVS: 0450A714CB X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6049001)(6009001)(376002)(39860400002)(346002)(189002)(377424004)(199003)(5660300001)(66066001)(65806001)(97736004)(2906002)(80316001)(65956001)(3846002)(568964002)(270700001)(6116002)(8936002)(72206003)(81166006)(86362001)(189998001)(316002)(81156014)(2476003)(68736007)(16576012)(53936002)(8676002)(478600001)(105586002)(106356001)(36756003)(65816999)(87266999)(50986999)(54356999)(64126003)(305945005)(5890100001)(6666003)(4326008)(25786009)(5000100001)(16586007)(4610100001)(59896002)(7736002)(6916009)(83506001)(6486002)(101416001)(58126008)(21490400003)(77096006)(33656002)(84326002)(16526018); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0802MB2493; H:[10.2.206.69]; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0802MB2493; 23:UYoK6BFbJG8PZP9nUZcS4kSocAIXIrJQqt3AYGJ?= =?us-ascii?Q?RdkWJc+5Yao0aQjJ6Iykb0gUMa9fjtsJiMpiuoJIPuVksNSJfuWsTmJLTdSI?= =?us-ascii?Q?IkTKImmGpQW1HQ9HsySccsqXgEdijMtF6lgEl4+CdV/KIrc5PTBfC/goD9TR?= =?us-ascii?Q?ihAp/wihWpZZ0Phi5LAH0STBl2QufvZSFWEeoazVSnPFiExJBUTN4mmjoZUO?= =?us-ascii?Q?a1lY25VdmfpnKGSuwtC97Cvo2OAEp5I676UFXW+iK+6coCsielMOHXFU4E9k?= =?us-ascii?Q?zhI1waGIGavei5CZNAW6vBYBbwVShkzDReH6Ubw+5Ul9QNQf8iYQGfnG0YS0?= =?us-ascii?Q?nZAs0Fhzth4lcLBxU91vwO0ubcL3fygNCTZ9eLx3sBt/Zvkbhk6z0T8IXchx?= =?us-ascii?Q?GO5+2BKn8hIgVppAMFYJle5IxuNmJxX9+4Nfvn67x4kP10Z/gh9klSlOk47d?= =?us-ascii?Q?s3nwzYEqK6BWPbWzGkmKvfi596NiRAdwtXqxZ+SRxvESSxI0x38EoGNw2STs?= =?us-ascii?Q?AIhxxGyzyKA7dF5NwNGKavp88iWXm4j8FDrwHYc53HWtZvhTqgtG2vnxsJab?= =?us-ascii?Q?uwKSnGpVNTlBKp96+gfAIDpcE/6EhJ3h5cjzDwfhl4rphbEeO7H04pHa7itb?= =?us-ascii?Q?us5R/5fhMn1GDIFbAav8D6x6YEpHj+XJPIZHPYd5nwn+ES8/3Nk3Rc8HGUhi?= =?us-ascii?Q?3LQh1IJZQ1y+/qZRjiUgNTiv9qqEq5v0w3W7qjsict2/l3TVw2FApAjtn5F5?= =?us-ascii?Q?xuSXdaOW3bCy7fMZxMn7Dwcno1zeqUwKC8PCHD9hoiOn7ZTvDyfFaWKibnxv?= =?us-ascii?Q?+WUlZDJZj5yNF6meIL3TCuo6NP0JJkus5q+lzXiZP2KIz9mk+cOfPb8K3LqP?= =?us-ascii?Q?GN+jBL8oF2QRRceQ1ePgEhi9TPFnABoDguxGoiSwbAmg+yW6RNwvXqbmAjpE?= =?us-ascii?Q?QzgjDTDZo5hPr49u7yS1BxMc41ug494LddSLPalcm+8j9viNSNzvC2JHVPwN?= =?us-ascii?Q?514g26MH83bYkTggF2TbnyasKRKx6qADPpfXZZwf7Hw9Lmmau/4ZULGnBPDg?= =?us-ascii?Q?6MDrG9M8xS0gIndS24rW49aTM825WUXFvX+Pp4hW4iAt6WpiiJHH2YWkriwH?= =?us-ascii?Q?qTIWuel0gvzzEKYWuQgcr18Oo6GXz7sAiFDg/UlH24XV5ln1XSdjrLMCZM6P?= =?us-ascii?Q?7sMlYrcj8EUyRXEjSXURjQFnNpQgBs/B5JkabPLK+8WI5T2PAvp6ZYVyEE3s?= =?us-ascii?Q?d7aAoBYaIPV+YrrLe+5Q8JSKSIsYxpXPN38FmgZJiMxp9jX3njlqOVw31cg1?= =?us-ascii?Q?Gpb1kE+Pd/70eLw3IUYpXEAEslLEeJ0AuSGLYUlisDq/nejmLQlHLEgtHJnE?= =?us-ascii?Q?Fz2XGiIyKdKDpDoRcZXd6LZ2Z0eVZDHNx2RcYCAju47ZhmJSp?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0802MB2493; 6:eCg8pb6Vu3xar+zbzqNsW1AxUG+6aG0eaxr4gwNyvBx196fsePBrXhR0rV/7jboHafnEd/ww+Tbo6P7T/5zHarfWsdGroyRThiXL/4eAcFFl+ybpLi0OSeZCt8XUxhEI8kP3iwAj09nYsuO9/kXDkHYzB9PQHxdRap8c69w3rLE8dBWRE1nLXplwRT7RVF3k4MGr0jyZvXsE6Fr9HgNMfisUSqSlLEWae5kHBlR8K067VwyNdbdDN7fXqZDcgjBWXjRdDbIKWcLIx69ZELMX9jWDguxzb4yiiL0YtYELwS7Tfv1Kp1pIAl/2Km4F/Q9osfqbFEWhQE6bQGw2J84PwA==; 5:ES5bcYM/E4wLYXe0Fg6FvGHQexL9Jnz4d7MBuas5cLu3/JcDPyMHLqcFN3f+d3Qms9MKTbz09JjFHxpzW4Kyi1GeOjYmz2T6iEB6GF3X3W+TAQ2rNqQA5eDo6PUJCpFmwJ0WxG0Orf9gh56WX8oA9g==; 24:2CEoJ3AGv2WQH9MQ8m7ySxb1hMFRoyNy0j/pBykDgrTmhXgLK+RC+lJbe00MHVZCWENgC8vbRnws/RCXSopfrjr0w8niROdDzl0UN10OrVA=; 7:xU7M9ni4NnDQi2Ky2NF+D6CQJYI095k/RDTLfuEbnSrXN1+FFIAzKFHixeCGpmItpolaowfLfAuX/MuyaFGI9cV1ZhLbU7UfNfSggV+rCrP3q4XXvT6MfzcRqMyBlS5VUuR2s+b+U3rIChAzCOLK89b4S5uCi5C9cL+JmENfNSWHwxx4HQlJk+V0X6aYj2PoaozJJ7hbSlWRcCLmKLO2LF/wsjPxe3Jx9vYzqzTlXbM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2017 11:35:37.6763 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2493 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 * sysdeps/aarch64/dl-machine.h (MIN): Define. 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 #include +#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)