From patchwork Tue Aug 22 17:27:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Ellcey X-Patchwork-Id: 22312 Received: (qmail 99255 invoked by alias); 22 Aug 2017 17:28:00 -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 99236 invoked by uid 89); 22 Aug 2017 17:27:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.1 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 autolearn=ham version=3.3.2 spammy=H*r:sk:mail-by X-HELO: NAM03-BY2-obe.outbound.protection.outlook.com Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Steve.Ellcey@cavium.com; Message-ID: <1503422868.28672.28.camel@cavium.com> Subject: [PATCH] aarch64: Use PTR_REG macro to fix ILP32 bug and make code consistent From: Steve Ellcey Reply-To: sellcey@cavium.com To: libc-alpha Cc: Szabolcs Nagy Date: Tue, 22 Aug 2017 10:27:48 -0700 Mime-Version: 1.0 X-ClientProxiedBy: MWHPR11CA0019.namprd11.prod.outlook.com (10.172.48.157) To DM5PR07MB3547.namprd07.prod.outlook.com (10.164.153.145) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8cf1a23f-98a8-4369-60ea-08d4e983205f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:DM5PR07MB3547; X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3547; 3:GZMJ8tFIuL8pZbqnb8QwROziqbazKLQ4mh/i5qVXFSWXYxxhCjtCNWvEy72vQASK31TlVgO4qFIGxX+OheWdRn0cNzZ+Zdq68nwARSdJpjf/JmShDLU2eClsrQPBHkK9WlJH2+LVjKW1aXXqYOLaeoz4wu3lin/tr2vL0edymtw1dP72CH5Juom76IBEH//TWbZOEKwI6bK/mvmW/0zgP5mjbrphSTqHNAYl/bbQgqMIA7TV1W2StG3x2++ZtsPL; 25:3WD2xxzL2+vLavgOKUUu/MtAFE2AMwlQD29Qo4s3Du9Xck2n/p9cOg2M7uoLWP5SIC6DfWGOoKr4Dp9l3lJorV6tOOyw3E+ksmTLq/m0+B3Jqb+c9zfGIzMOVPegGF27fuX7iHFSB1ixUEOCmnmgdyHcBtJM1wlfJJiQ3yLGEpm9xvdYlBZYgCrnHQkoRyaFrvXYI6RFHH4N6FTg2zQP2uQVvm1QoSInkiQkkfmG8ZAOLAK5ss7XfNcD6fsmJrkW6I/MN8MJZzlqJ8MkuUXTgznzrz0CP1rGaN9D7W0iHETkAtWFXrgEUXEzLZiGnSQA0TnMkwa7KLeucrl5h+Zh6A==; 31:ZN46YnFMlqtDaso+MAtQfPUUF5Vh1pXG9c0j2uQqpDIaa6pdcKwfFHPz46IT99hYJxNyUINapIQqzwsFkmyuJSlH9C9zhtqG6Jq2VoVupi0P8YPUkaENC2Z0mMLLEeikDAdSciKHQFW5vuZijLN1lAGi1c7YyzpAHr0oHkYKxi76wQP6WP+QYL7tzkpZzyUZ+5Es0yGnGnfH/9eNktxM+powViNvO0bHzHQdHrdMqps= X-MS-TrafficTypeDiagnostic: DM5PR07MB3547: X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3547; 20:l4ZNLIaHudArryYlh4BimR7wAlTKD6y109aqQTujIWdXH7mbDiwkpwIMH9pad4g6yZUSOQhbTiJewvbFyVJx8C3EzVTAadIOtJARfvwNSYN6f3ybqziOSfmOyy1RSQDQCRAGkTZ7ySKnS8rbryWd5sQ4gON/HEUGqoQVUy/AL+zXun8itRb3tsAUaumso3CYIsraF6iWxp0K8T19hBlb0C/z8xq9XRBDyYDROHklosaGarI/lzjBvsTh+F2s+xEq2xxxqC9LIf+ZA2fAwvEu2yX+yGSmZdt8I+UyjF6ABmGhk4OlgMdjnWbNN+4KrZ8TAJ848H8nMCYvvceYX/K+AOlcPQGiNt2z58oPPHyeGDATGpEQLXiAOjdACT1c0OYLK2MYy+qEOiCoJoi1fxcprh4J3CeErNVmEvRiCjdPcu0I+soag+G/9lKeQTJvAQLV7LMest6kTfrdMy7xlcURC5rQ1sMC0wDK870OM/5UMtEEAmhY3pi44EX6tnRdDu7l; 4:SyptASruVTaFd/qTb1u2VGUabhALhWThHOT+Ovund2y5Y5q/KLqGfAkFm2l9BqMKvdAIhbzDxeVNYQjh0mRlQ7BgHmK7xYdLIkuCt7tGVMa0D679TSMsoNS40lok8oH0y4pw96text2fWgFHKuvsFoaAkz4gchx4/7LceQ3nkYqDkOY0oS4VUqf38u9czZLvrBnt1/di76K06jxSHAHJiehXHeJOZvtyYmg2Bulm2FPzKSLkmxA/8a3SHFFwk0Op8d9tZ5MLnE1qDJvgj+K70I5yjcnsER4tpe8CmxzsXqI= 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)(6040450)(601004)(2401047)(8121501046)(5005006)(10201501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(6041248)(20161123564025)(20161123555025)(20161123562025)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR07MB3547; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR07MB3547; X-Forefront-PRVS: 04073E895A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(7370300001)(6009001)(199003)(189002)(377424004)(97736004)(72206003)(6506006)(47776003)(305945005)(6486002)(478600001)(43066003)(189998001)(3450700001)(5660300001)(33646002)(6116002)(7736002)(66066001)(101416001)(103116003)(25786009)(3846002)(69596002)(23676002)(53416004)(81166006)(81156014)(110136004)(50986999)(50466002)(2870700001)(36756003)(6512007)(2906002)(42186005)(50226002)(5820100001)(6666003)(6916009)(7350300001)(68736007)(106356001)(4326008)(53936002)(105586002)(8676002)(99106002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR07MB3547; H:sellcey-dt.caveonetworks.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTVQUjA3TUIzNTQ3OzIzOmhPaFBEeGh4VXpZYmJnajFiWTd4eGhtNmpq?= =?utf-8?B?R0pPT3ZYTHBwMWF0Y3VIaUJ1amJGOVZPc01aWjVhUHJsMitnWFYvY0UwcWNh?= =?utf-8?B?a1RNREd4ZmFieTdPVVAxTEQ3K2RIL3A4MGt2bGlrbVpmYXZTNklTUE4xVFJn?= =?utf-8?B?MVhxcFdSbUY3SjdyQ3JFUTlOcW1tcUFLS0h3MDg5TTZWb25hdDlSODBNVlB0?= =?utf-8?B?VDVrM3paZHZzUnQ5a2Y4Q255cTBFWkVTaGpoYzJzL2FrekJQM1hGbG9QbTlW?= =?utf-8?B?U1FPTWpsVUdXekRwSTBJckVwdDFmdmxUMkFuM0NtajlWRlNBbFNWRXVWMWtI?= =?utf-8?B?MmpRL3k3Wi90ZmlCSzhnSnAzOGU4azk4UTE3c3Q4NERpUzB5MXNrZ0JMK3Bh?= =?utf-8?B?ZXRuelVUejdodDVueUZra0hWb0ZnV0hXVVl3UWtFYjg1d2xHdHM0eEpubGhj?= =?utf-8?B?VWtjM1VJVncwR0hBQzNWMVFmVUd3VlNIS2NSayt5ZDUzRUVsVjdkL2ROb3la?= =?utf-8?B?ektYaHlvczU1M0VCcGNoa00wdkg3NXpMcW1wd2k2dldEK1VvYVFTeXNGWGdx?= =?utf-8?B?SEd6d0IwaHg5Z1Y5ZGdmQmhCNGU5L1pnby9TK0J3enM5ODlqZTQvZGtmUkx2?= =?utf-8?B?TDZTMU5jM3dnTEtUS256ZXA5N2F4YzVqWFJ3MXNLdkFOY0xpa3BaazlLRnZE?= =?utf-8?B?L1FzK0lGUitlSG1VdE9vYTRRbndkWHZRVFFRdEVZdG56TGdhQnJXeFZ5ME1p?= =?utf-8?B?aU5iL0R1OHRvRExhQnEwSFZiWS9uandoVG5zRFpVaUNWdHZwQ2RSS3llb3lG?= =?utf-8?B?WU9mOWJKZ3VtOVNGVjdYMm9nM2loalRGUUVOdjAyVHFrS3dSVGVha2hSWTVN?= =?utf-8?B?cVNGaTVBQWxaT2dQeHQ5R3QxMUZLZUxTY3JhWDNsUDNyamJYT1RHZ0w1T002?= =?utf-8?B?RWdkMkNtc2tqYW5WQTArV0RNM3JhYVJ2dDBqK04yYVBuUXErSGNJTWwvWE4r?= =?utf-8?B?NmhPVVNrNmVjeXBlTjRaUm51VmhKZ1JmZmhYVFFwdmRFVkF6cElRNTJKS0F2?= =?utf-8?B?aE9zSWJocFJkZ1R3T3dvOGZDelI5bG1GVE1pdlBHdW93YmpyQlhZVGJERHFP?= =?utf-8?B?eGZHbmlsN2NEYkZpL3FkaTN1NjduLzIyVFZmUkpLbll3VkZPU1AzbGh0R2pz?= =?utf-8?B?WUIrRUlpam5seXdHWDBoRVl6bEZDUXFuU2VHYlR0bGZmQjRaN243T3N2QkJN?= =?utf-8?B?byszcTFqelg5bGxQNmFnZ2lkMEFsOGsvVkNLcmVDU2FYbW9Qb2E4ZmFBL1Ji?= =?utf-8?B?TldDQjdNZDhzdUVZWkhDM3F3QW9MZFZQREU3RHBWVTZrNWF5Q21XWnFMQlp4?= =?utf-8?B?MTBFbzVESW55OStBV3ZTbllDU2NLZFdTRy9BVSs4RTNkaDFtZ29ZUGRFZ2l6?= =?utf-8?B?YmNDU1NCUDI5blBHYUNIdVFCZG4rZTJZdGlsclhsa1kraHA3WlpkUHFZVHV3?= =?utf-8?B?VlhGYTh0c3lVMC9vNEhESGdEZ1psYmVkK0N4QTNINis3aWc3dE9OdDA4VXRQ?= =?utf-8?B?eGV5MGtjUm1CU0M2Yml0MjlCVnR4NGlqNytSL2ZWMEZEWkJZWkxsbi9jQzU4?= =?utf-8?Q?gAKRE0ozegP4V3CHz87x?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3547; 6:YFzI88hsxlt07fBHZIMjDPfOCApzW4k8rEQjU3fiYh1DWLasKsJYFHCS5+KZaHc174aV0Oo1y2cZ7YWDxPey1vsAzuRks4Y3RepsZl/6zM7nVV3PV0nH+5GIkGkOA4ir76SOgBiKFk5eVMArIdzPZblsQQWfQ2TZsrtwPBUBBIcLNisllGn3k1SxMi1UukfVQB4vbdf62gihtXG8YjnLzUl053VaQD4nL8oZT5Whp9gjdz5KUSPxzhiJuJKQ/vquENxIKBg45w+kIJ5v+EH81K3dUEpz93CHNS3bzjlbrgw5Srkna2aFXsluFdXQIGF9Ge6613f0WyBbSHYZCYdzcA==; 5:buk3bja5X4HkBxU6jbMsz5RAufQr2x9q9Z7fZ2QQQHeODoaC/lLjn2cFBDeGRHB6YVjRxnChbs7RJBMuzpwG67epcw5a46fZjra0mgKrVb8SQ7uG2HzenbvgZqjYpu/AUpDPqIug4fNRiWzYdXIMDQ==; 24:8N8t/MbODfSwYdeJa6yUfGZ84aWJUN2iFfcgrYx0t35PuDWL8P4MWYGelbk43YmcsvvPQPyqLOG1ss+7HQAiQUFQDGBSarQKicuUon4yNds=; 7:j9AXc+rXjRBbNEW+yO2NsG4w0tqQcP4XTMAiaXNeCDHIFWil03suEOvXtzeZpsIJYZRMVudK3SWp6SSAKU1CeWGYCD0IC1aRkhwiwi29X10ab5JCkzFHdSWKQ3tDL24DT+z23RoxlNeYWnwKbZE1c6toOM2DlhVeewKDu3pG30b3HhcUbY9t/BcsMnhyxsJFRt8cq5M4XoyFEaki0dLf28nPZ1tkyVRcCzZKbVtYx6I= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2017 17:27:55.6535 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR07MB3547 This patch is a one line change to use the PTR_REG macro in a cmp instruction in dl-tlsdesc.S.  It only causes a problem in ILP32 mode but I would like to submit it and check it in now so that the source code is consistent in its use of PTR_REG.  Tested in ILP32 and LP64 modes on aarch64. I think this counts as an 'obvious' fix, so I will check it in later today if there are no objections. Steve Ellcey sellcey@cavium.com 2017-08-22  Szabolcs Nagy               Steve Ellcey           * sysdeps/aarch64/dl-tlsdesc.S (_dl_tlsdesc_dynamic):         Use PTR_REG macro in cmp instruction. diff --git a/sysdeps/aarch64/dl-tlsdesc.S b/sysdeps/aarch64/dl-tlsdesc.S index a70cfd5..3b2da62 100644 --- a/sysdeps/aarch64/dl-tlsdesc.S +++ b/sysdeps/aarch64/dl-tlsdesc.S @@ -208,7 +208,7 @@ _dl_tlsdesc_dynamic:   ldr PTR_REG (2), [x1,#TLSDESC_MODID]   add PTR_REG (0), PTR_REG (0), PTR_REG (2), lsl #(PTR_LOG_SIZE + 1)   ldr PTR_REG (0), [x0] /* Load val member of DTV entry.  */ - cmp x0, #TLS_DTV_UNALLOCATED + cmp PTR_REG (0), #TLS_DTV_UNALLOCATED   b.eq 2f   ldr PTR_REG (1), [x1,#TLSDESC_MODOFF]   add PTR_REG (0), PTR_REG (0), PTR_REG (1)