From patchwork Wed Oct 4 16:51:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 23331 Received: (qmail 66664 invoked by alias); 4 Oct 2017 16:51:54 -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 66655 invoked by uid 89); 4 Oct 2017 16:51:53 -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= X-HELO: EUR01-DB5-obe.outbound.protection.outlook.com Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Szabolcs.Nagy@arm.com; Message-ID: <59D5119C.3060607@arm.com> Date: Wed, 04 Oct 2017 17:51:40 +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: aarch64: don't use MIN in dl-machine.h [committed] X-ClientProxiedBy: AM4PR07CA0026.eurprd07.prod.outlook.com (2603:10a6:205:1::39) To VI1PR0802MB2493.eurprd08.prod.outlook.com (2603:10a6:800:b4::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d30d8b9c-38cf-467e-6fe8-08d50b483481 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:7YS6wtK+mxSuidHUk50yMb8n2+FxnZlbujNRULEQEPYkfw9/C0zAEB48vJcxrVe/d8v0IhwpB8h1IJKWCyZ/5z2zq5EObWv9ZouTUqMaufajumxzYRhuSPkn0vWJ4gZmZX2ckfPc+hiiMCBeueFhoulHUNXdLYJRpd6TGG7UWPU7TA3PFCva1QCJYppbIcNDSDxDAsaJbtXpypF3rycZopwpa7A9KxggaTi2ykRC1JEAhCiN2M+LdflOD7asrvox; 25:DaUREbkVDQ/tz1a89Z9aFhc1+LnHQ1iRonmlZ7WgYRnbJPr080lX+1euQK4X/9jLLMz6hi4QC70z8lLxBYa1mo9YrAEpaJNbLaaxmEvAFneX++WwCgwE0xQgFh0gpGtxDum8UHiOL+NkEexScn/KPaQRgBEbgwg7T9N0H1zySFK09vpxwvH1zIwHhcWLLlmT7QnAfMg2WeBvPl0iDsbpE+J8mciJzbSQOdqhE59uhwODZpz44cDApsZXUO1CxGvDelL7mgAq2lZCPw9anG/Z7OGA6WXw7vnhhVMAr/cyh34zHrwageZo9fnAN58vhrdXwpDsOOk8AZpDNIqIXuo5/A==; 31:fBSqXBN4uGG3oEwhQo5pXkIw3I6xZLNGkIDvrSFQGub/ht0JnsQhlqsufmKfwWQljQvmsncl4crVEhzjwG3mOYtxojNjtzvi2f47aIwPgzx+sGKalEqaTNCUDmvi5+Yq2okkVlfkbJ+B1YM/yn5cNX8iJLkm4ADK99myoRTm2dg14sII7RfuP1On1CqbmNM7mmmXnWfF2W/FWsCClgVJXrL/EC0XMgQNanEaqhmKfQQ= X-MS-TrafficTypeDiagnostic: VI1PR0802MB2493: NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; VI1PR0802MB2493; 20:xbtfhIjwhaw2dqbsRYToIuGA1XJmpSH0CefzKgXfZ7FnZCkNBphrNptvTNkAU5J0/xhspQ7lr1bd23axqZWaGmcEvOcAEP+amTCouxrhTByR2kbjyZetr4weSN5G6Ir87dsRIk7ZzeepPGIb8tWjRpjqw+9s2RfbjHX8G/MWNMs=; 4:0k/H29EbOD2dDhA0QnIKWwXnjPFZC1G/uDodOuPX/b585QFq0/jdB8XBuD5XBLFO9ND00Z1q2NsL092Ffk+O1gVtqiP5KysScrzeWKjhk0554SbxNBhDI2r9hhMwe4eX2slLau+YSfYRGWcjP8wi6tZAjq7q+lr9U+gdcV3UAYxx2mZaKOLIOf+kYJ12FkQpSHMdhaFkdBBPfGd1PmY72D6A0QQat961rk9ifgoEdpeit+FySEc5vPgR+SPr7I+d8UDhgKyeJCyk291f6dCiJiqm6zzNDVMiTpdW7E9MOdI= 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)(5005006)(8121501046)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(20161123564025)(20161123555025)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(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)(39860400002)(346002)(376002)(199003)(189002)(377424004)(305945005)(6666003)(5890100001)(64126003)(25786009)(4326008)(54356999)(36756003)(65816999)(87266999)(50986999)(58126008)(6486002)(101416001)(84326002)(16526018)(21490400003)(77096006)(33656002)(4610100001)(5000100001)(16586007)(6916009)(83506001)(7736002)(59896002)(568964002)(3846002)(6116002)(270700001)(65806001)(5660300001)(564344004)(66066001)(2906002)(65956001)(97736004)(80316001)(16576012)(53936002)(68736007)(8676002)(72206003)(105586002)(478600001)(106356001)(81166006)(86362001)(8936002)(81156014)(189998001)(316002)(2476003); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0802MB2493; H:[10.2.206.69]; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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:hQLaskxPv8rSuw2XRxBosVbn+bfa5bCi/ngIWmt?= =?us-ascii?Q?P6AQ15F70DKOLj2ychcTTJ8aELvRP2QP66Sd72SzMgaYCdTBA6Oy0QgoZqw8?= =?us-ascii?Q?jU1S+jIabjL7dl1hfgDve2taJn0sflNtCQLD9uMbNJ5DhyDEDPKLQgd/vKFg?= =?us-ascii?Q?gJjyWaaBjVA9geUcJNWzaQ1vPKzCIUWRacMqEpXIhQ+qEU7KciLpWH4PVqsp?= =?us-ascii?Q?13PB+4MobN1nuNssv2OTooOuEowCkkKfqzrFf6GJvNDaGvjdmiASccpwAvK5?= =?us-ascii?Q?U4LjGyMq7B6g7d56LccF/Yt5LNoJXdmkhSZvia7KRiFohurl9SgEgBqDJUnu?= =?us-ascii?Q?e3KPjy/rrEIrNVO+mEI+tp/f2M8gox0rH1kzQiSlAgxnWdvJZgdvOYYRvhB5?= =?us-ascii?Q?2hg+/K72juC+Yx4xMq+4EE4nMw2alcie7e7SbA2YLgXKEyu/L5CZEUiBFJ50?= =?us-ascii?Q?gFEt4lJlmQ3yqPlJwK0L1JnE9/RErX3BN+Iqmdn4DEo3EdgQy+cFLVuCvIRT?= =?us-ascii?Q?ulbyZF8qeWk2Ddjv2+Pt9ne/hVyHC/imlTOHJrgT23lhxBMtLqcKrSNDr26S?= =?us-ascii?Q?2+ScNlQA1oq82uBJWBo7EiljH/ZfIbAt4gb9+LreXuvSTXxZNVpiwi9dCKTd?= =?us-ascii?Q?WODx4n2qzjThGjAWrt5O4TOSb15Uuf3oH4wBvZSiXKCwJqMRedB4K5bvkMuM?= =?us-ascii?Q?z8NwQIGkXgSeJige7kSW/f4d/4Xb6X9/oGVbX/eFNryAjXCY2K9/55HztNU0?= =?us-ascii?Q?TquLOXuBZu8mEJcwnWpRA01CyBGUQJqVbAmwsp+g1q4IqWd/YP19f+7/m0Ok?= =?us-ascii?Q?YAn0haiJpKZgmPG0lL2AsX0UIIK01OAzf2oMbyz0DenCsu5SBqR/zzWBrMRY?= =?us-ascii?Q?sRhVXF2Fb0933F4F9TiJ0Udv/r7CRujcai/aeARl3JhAI+gxr6UXV6coZf/0?= =?us-ascii?Q?prddiZ6xqE5y6NlukaTp39Kg5Vdn6z1kch2zWWByO8+ebSl7yCYeBLgplRjK?= =?us-ascii?Q?RoWMDyb6ICmKLYAUb/Y3jp298ZSYQUwlqpKV64nkw89jcPxSgmPJh2EhpGWe?= =?us-ascii?Q?01TEQZVRsWql0ly2odM0FvgZxRAlNWaBv9i75yiIz70DjVqk/lHSKoZtez+J?= =?us-ascii?Q?SQ/Cp4XXMDzzKFV0g9QYeMzH5RpTLETxnwCApSA34iukCA9uR8rf/oEn+nuI?= =?us-ascii?Q?Z2YBycLw9pPhQ+jfX2qJ4E0kDR+G6vgo/K/FXBMjsBbnP58wghDwnGUxzCe2?= =?us-ascii?Q?N9c8GFYzcFvNivOPE+EsaTwYlG9M0IYDSew6x/LW0AS85BNkByywHL2Ief35?= =?us-ascii?Q?6RVltIxlIerF2WvkHVA77EASqPxVhr+kFqFwhdBfEvIimVKH/k5s9NcVEgTX?= =?us-ascii?Q?hywW2lBYDE+Dokty/JiHrIlCUmXAvv2XvbVWPTbbqDVJkNa+ISrrA7ANBG0B?= =?us-ascii?Q?jHknUy0we/Q=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0802MB2493; 6:+aK16TWYWC7txFvmKKRQ3Gw2MAXeK3auap4c+MnW70ymWup7r9z3tYu/GLLIggb5oTb02w8fZViVJwhAY41pE+3S2CuENUU9zTl1hzGRglMyET2ro5NHFZlxI53GzY4FxDrDEVTr300CmESq7bGVGPhc4Rj70DBTNydkvi7IU547wX+V6R/sIoS703BUSf2pF+GBXy9smuDrZKHVFefJWfcgbMBUcOU0vbvA/Kv3A2adRzF+xsdsXtO8v/lJTUfFbStt7z97gRyf86XJZJxj1gvWjiL0qqfvpmflLvHijcNtbT5BlVYG0OkDEJmSN55M28yZd7WsTupEGTDpYA/N0A==; 5:Q4COiNzyAJU9+WD6qxXdhB9NBCr0Mov6VmS58EGvPISeAukHKHgMiADWoWF8OjyZZHYb1o9eBwA8aqSXpxYqJ/rNd83U9ZLSme+mvJzRcOYx+NMZvU5ewp7Zdar44gPNuDcz2j0xoo1oBaUG2XvLmA==; 24:jkxzZGJMzqm1Dc2OC6t0L32u664j6slZrAR955fNXFz731BSMaepA6N0nRzPXAadDOxqCZukVU5cDMBs1lktE9rmBVPr3rEA4m7yXO+96IU=; 7:UpakzHA+anIhKv4QfaJqFU6J08tIYEWD/kX2V8yoZUNl5NqeilcwsRwtd7iNIzCZytMFSPLWgWY8aN+UoscgoZGlhzMNKU69HD9W2Ufb2i2j6iukV6qq/0FCmsirIZKkMwlDQDSe+JMyeex8vI23ftFDAx8IFRnIVhHhmijddD1fT+SV6BbjnGbLEA5N4j8uSxIYW/3Dq9R7EtFnwIeANlyMDfa5cwe0eYB+/5T/vOE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2017 16:51:48.7341 (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, so expand its single use inline. 2017-10-04 Szabolcs Nagy * sysdeps/aarch64/dl-machine.h (elf_machine_rela): Expand MIN. diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h index 60472036f5..b1245476dc 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):