From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7638 invoked by alias); 4 May 2017 14:17:17 -0000 Mailing-List: contact elfutils-devel-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: elfutils-devel-owner@sourceware.org Received: (qmail 7470 invoked by uid 89); 4 May 2017 14:17:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.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=tricks X-Spam-Status: No, score=-25.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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: EUR02-AM5-obe.outbound.protection.outlook.com Received: from mail-eopbgr00128.outbound.protection.outlook.com (HELO EUR02-AM5-obe.outbound.protection.outlook.com) (40.107.0.128) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 04 May 2017 14:17:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qtcompany.onmicrosoft.com; s=selector1-qt-io; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Upq47m19TyG6tRjOTU0JdPA80rNAPv4lIh86G9PKYB0=; b=YwOG3PeROtkMrAjEyH/7jwAFxzKUZAV/3G/slT09ShT90ZN1aKEGs0OClb0c6YbTOpW+Lm+rHdjo6h5QiN/z06q0hTUQYX4IfGl/uGj2tsygzJ/4fsR/6KI81zIx6ynErBtnZ1yIzZS2P6k1aC956uHFXwgZC+Hn1cqktlARl5o= Authentication-Results: sourceware.org; dkim=none (message not signed) header.d=none;sourceware.org; dmarc=none action=none header.from=qt.io; Received: from [10.9.78.56] (62.220.2.194) by AMSPR02MB229.eurprd02.prod.outlook.com (2a01:111:e400:8022::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1061.12; Thu, 4 May 2017 14:17:12 +0000 From: Ulf Hermann Subject: [PATCH] Drop the trickery in printversion.h To: Message-ID: <4e046e09-52cb-0bf4-a7ae-95c9426fca25@qt.io> Date: Thu, 04 May 2017 15:05:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [62.220.2.194] X-ClientProxiedBy: AM4PR0501CA0048.eurprd05.prod.outlook.com (2603:10a6:200:68::16) To AMSPR02MB229.eurprd02.prod.outlook.com (2a01:111:e400:8022::15) X-MS-Office365-Filtering-Correlation-Id: 852abd8f-9dd5-4f7d-ff2c-08d492f84258 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075);SRVR:AMSPR02MB229; X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB229;3:Il0V4BopIrF3VbHY2mzwgTezoUSc9c+NU+wlsccVfBijkalfmlx0uopmWFbO4NDPxf/VmIzIQSj6bv76sb+a1qhesKZqzMoxBU0uFQq3qzUwQrN5ti0R+CzYWZQauetbYZ/+wzkqYvLPMXNP7J86pGBUFpt35xubnMJPDNieP6YWAP2Bfn0xHccL6Dzza5mkMpNwlNLktdpt8uGjDYjlbY9ZFYeeF1FQhkD1ycp6h2UNp4Nyb0dcuZLkBq0CRnbB2wJbZuLYRbncFhbJqPkPM/HgXQVjdg3tVAfEyoEEEjizDwR9NqyXEHwRJzUYA10/;25:DDlwR0r3KffrPm8AEJ86XczT9Yfb5utbBRJf/yMSxpMhYeCtzFyirEddi0xgzW6GAHZK6ITENdVMLJGXJXI4dwxR0P+uOL1wZepYZ2iaFHBHQ6o36ApEi+9Tzc4uz4FBa3MCaGniBThC0zDJpCojCBVklWaJVsgFlJ73O5TuzXnUsIQlgTyI5r5Bm6ufxpLiYXy6sdaACuxXe8vebHX/+HRMsmm3vzyYQDgpt69DzI8kim4/qTx3cH6jVRxq5aDYWrFRSw35kRIi4afPSeZjIfMU0RfJmwnPiSC8enisvXgL6FNDDcvy2VsfLra8cWnnv9vPIy+C8q2S3NLsj3zmaT+pkAfISw6hDQvYZfFfls6bbuB10GNqTve28StXLfRorfPy8iHMY3uGBw3/7uFWP3q7mq1AXJNaWcSNFiVUtlfhNYO+E4hSBRgezdWuC7Uro04trjs41nlLaL1O0E8q1w== X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB229;31:0QtdGhqIttLKAjSagxDRk/sBTqz32FoM4aVHLJt3T1aA1DUMqfEecOlBNlTtli3CC8MgNCZf7wY+XpYNhVjn6LkcFAJPiQ3OB751UsN75iivUZw9HBenzd8ruyGCDZjdCkeGsUw1JtkqU7ol/jYSG/ok2Uk51Im0AN2Jv/tWUXwNZafobprJpChx7ikW1c/yuHt+6fMJQ7hd/Xl0RxGbQrcSdxMbo4qugQCXo2LZD8VBkmH0Id1wwq2/4q725+7TGXloOSMEv++5OzaHt51TKA==;20:EUGnCM8KXZu9Ruglk7kYMv2oTnTNhhDCbS4sMyD+IaEHXNpP7cuCAE6/myQnXiHOwwysOa/Cer7KOB1AAlFIYiLu4DbM4oM40bBf/UUq+PuhMPSUgzRCqZSiYoXg/ugLHPN+PuoMEDL93CE6VTu8VXumcmmKJ9Kae54iIkUYWwV82J6vfiGVcdLM3cqR9XZHMLBdvBtKi5kMtVuw4aNebfYfW0q1w5R9JTiJphNxPAIR16PfNEP5y51R9S2bHbx4 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(6041248)(2016111802025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123560025)(20161123562025)(20161123555025)(20161123558100)(6043046)(6072148);SRVR:AMSPR02MB229;BCL:0;PCL:0;RULEID:;SRVR:AMSPR02MB229; X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB229;4:zcFmyAmTxJ+2QH7k1M6DjERc4CDhjYOVNWirtxWfhQNAyNqTp9jK8tq+9x6pBw/e3PSTcCB9uB295S36jWG16ehe8zVzBCPED9f/csTfMO12OKNzs+DvfLX6NzV8+E42A4VSr4IijaXsmgzi3DTuLHk+Aq7/ZYlvD2XGVNDbuTv4ru+84j1OgeWWl1yKX06JajT8cAcPeI/rdGEsz4LUIo11RmQlltxY/wcg+BaR14PAXoGdhfhG3mJrqingAMvUu2Hj089C0gYkbW2j3LwYrC6awpMpzDmbRpVfTFz9BtpWVoedgUBM7tQu8TxUElG2L+NRzvNRHbcaf0rFbbyLJIs2ID9ir2SjtJ4Qe8ZmhIel7GMaiX2IZ2JxEm9PO1RbTiBXTpNM/tQ5qYSY49I5lfDnoE9J3zqD7JgTJHN0ruG2llcEHUGFzX3Ap7fp+QfM9nJ+K/MRfckwSXQHRNfkMx2shoqpQn8UrqjrE1NjVvU9MxhByCXOBJWQTownyOCoOsq1bNTqtz3zrfHjxQOHWhD+IljOzyyLxfSmmO9mvPXN5MZa1/26tZHMS2QLBknTSuLToQtezpOr3jNyw6/mUHZva8Oj8fe1UB6GGAjwJ7Gd8JYtLhgwuui0HJg21Aq0WnW4eI4CsmjiRqtQ/bEQ47q6dX+t005ezeDz3VKkbyzzY37Bzsjr0Q0xRwLwDvMbi/ESu9OOtsxx8AqWlmeXoLDzTO0+pT4p6EQrgfRquGJgmUPP2R8d5xokQsDwmBexcIGkBLJnckJhUBjnk7jItmvCSD/6VVmiIIPjJCuskoCGUHsMveOXf2GoLj+SvYpLj6NoxMiBjTMpWDzu4y7R1A== X-Forefront-PRVS: 02973C87BC X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6049001)(6009001)(39840400002)(39400400002)(39450400003)(39410400002)(377424004)(33646002)(6666003)(6916009)(230700001)(31686004)(50466002)(42186005)(189998001)(66066001)(478600001)(36756003)(2351001)(7736002)(6116002)(64126003)(3846002)(83506001)(5660300001)(65826007)(25786009)(54356999)(81166006)(74482002)(2906002)(77096006)(86362001)(31696002)(53936002)(23676002)(6486002)(8676002)(50986999)(47776003)(305945005)(4001350100001)(38730400002)(110136004);DIR:OUT;SFP:1102;SCL:1;SRVR:AMSPR02MB229;H:[10.9.78.56];FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTVNQUjAyTUIyMjk7MjM6bEtsQzJWSjY4ZW1QOHlLRXBWQ2hGRytnSHlO?= =?utf-8?B?UVFBWUdCRnlSVFRQd0VudlgzNmpiYUFybWViMlQ1MzVURnBuR0pQZDVQMlVI?= =?utf-8?B?Mytla3pSYVFiQUlRMmVlcVd3QVBGYVpuNUFxa3M0czFncFhjNU1PTVMzU2tL?= =?utf-8?B?eWVaOWtoVUZZclFpaDRackxKc2NnSXRrY0RiLy9PWDNaNDExVm1CY2ttSWds?= =?utf-8?B?VHlYZUtGUjhxYkxZVENjMmVTTXU1M3pVM1BTRHpmdGFuTlFtK1czTzFOM3Bk?= =?utf-8?B?MU5LNy9SYTdoUnpoVmx2ZWt5MkNtTzl1bjFTVE10dEEvMWlkRTVVV3RtTm1q?= =?utf-8?B?M1I5TlRQT0ZGMnNlR1h6dDZSZnYvc1FMd0FnYUZmVlg2T292UFZnc0xuM0w0?= =?utf-8?B?QWFiTUJndXJMTjF5T2hpM25Zc3dLOUhPR2JTYUZHM2o0bzcwd1BNVVduL2Jp?= =?utf-8?B?eDNnek9PU3g3cWZwTjJCS28zeXNheVhxdUhJRURmOHc5TXBuKysyK3Q4TTZm?= =?utf-8?B?MGNycERtWFNXVnc0cDZTVEYwSW90Ni9sZ0lMbDh6Uzc1Y2Z3ZkE3UWgzRVRh?= =?utf-8?B?czVYZUZiakxRaER4Y2c1UXNtSXMrdXpmT3gxeEsxa3MwL21NYXpGdTZLOTUv?= =?utf-8?B?a0VJck1wREYwaUFDdEwyMk9mUGFQRzM1eEYyWUNtNHRGc2lmcGZ1MjEwSnpS?= =?utf-8?B?VTNxWTJXMDlpNE5wejlYYW5DVVlPUitCV1NROXZ1N0d2cVoxWSs3NHNLS2Vz?= =?utf-8?B?dFpPcE55L05OZUgySFhvaVJLK3Zqbk03Rjh1bEppSkVVUVBjNjdET0QyejhH?= =?utf-8?B?TFc4d0ZyUE14SmttM2VHaGI1Q0FwblA1WjRBTzZLcUNmeTNqclRrMjVuR1VG?= =?utf-8?B?N2U4Nk5PS3NZcFAvcFRHK0F2V2JQRWd4VWlwU0tmWm5zeGpqYWpKNWkwOWd2?= =?utf-8?B?dWRxKzh4NEZzY0p3NVNJNXY0bm1UYStLWWRoOUkxVCtHcVRSWEZTa3hmbk1V?= =?utf-8?B?UEovb3d2ZERMMGY4bVlxSHcrMGJXV050Z1NqeDBiOEsyZlgrWTFkNkw2Ukg5?= =?utf-8?B?NmZJeTRvL0YvMk4rdHFkS3p6MnR0cjBMaHhwWU9oSHpLckJNaWFxUnM2U2cz?= =?utf-8?B?NGxQUTI3WW4veWNjMXZRTXl4Mmd3blZWSHdzY2w3ejI0SjZWYUZvMWRnWHU4?= =?utf-8?B?eDF2aU5JRWhmSjFISVVvcVN0L1ArYU5NT2txVDZTVUQ1UXBOdGZmNFV1SWVM?= =?utf-8?B?NEJudlRxMVREQzIxRWlrMDcycG8xMCtyOVVPYUtIRlM3amprNGd2RUR4Ri9z?= =?utf-8?B?bmlQVTM0NEtJQnFBUXVPbFBydXB4ZzFpbkUyK0k4QUR4VWIvRG1heVpBUVdW?= =?utf-8?B?M0ZUTS9ockpkZ2VTUWFvRUZmS0pjRmJ1VFExZzdYa3RqY0RDWUNEYXRwQkx6?= =?utf-8?B?bDFLdVVicWRzZEtQTDFFc0xrVHAvZStyY3BHL2U3VkZxZUR3T0VYN3R5K1pD?= =?utf-8?Q?vi6z/fm22UZsCHh7hfqcvrPoUUYwcYzrTpurpwUnRjiSY?= X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB229;6:TrMTLGtzSg1s5iYm2KZtiSyZovj+0Dp1JAcs4hyTc0owzTTmy8V5lFmWpRMiauLskZJqfyuWNV80LKamd8oeT/tfTFcXzat3A3f6X5UHYCJ9q0LnwrTnWcWHkPogazSyukNyAKygN8jyKDZrvcXSQt+7ZVgNc4g9o58e1RiKdByXVcFPqVT3wwzqSCkanOTcdP9FWBD5/frbmb7eckVPb7lRnJ61Rv7uBWCwchD4BzG+I9pw3EBPsIJS0LMq/vq4+7pEEQhZp72gg2xjhtEhWvGpjCk6AMtTXZY2AV4kEwZJYQuTG+xz9QQxb0aKje1/Y91W4oDtxsMljPD81RDTcNAp9O7drBoopz9zEboS+0UXAQB8/vpSBlHQUy2Njg8x1ZYk3lkjtgTH2dPOvyM5HKI2ygXXV57PI6H5W9R2ulJY4DpNqLCM8870QZEjohUnUVHyE+SJxWZvBomWt0PntqzL0kjk1xqNtJMR33a0Lc4N9h+OFbpZnw6JBouHfc6fKdMZ2UGpV+ODnLb5PhXhcg==;5:e00jFw0EFCGkXm4GbB2JSPYLgye2OncYGrMS/g4wwvaHLBuVBwonkxc3qKG0gt3sZNmM75p3GC+yMDxdYQJOb1OQvfiMgU9cDzEGVBhFwX/eNEFeOlyToOKmxz5fRYLg+OdB2oO+2Wr6zsP62zhBEQ==;24:xA55hmMLStaKZPOB2KIYKypIiOx5B68nEPgHvJ/cwOu8no5HJtVC6Z/aLYO6tssm7BkBjjzsjyB9BxF8VCjc1Q3DS+XjMzuY878JK6fesJk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB229;7:JlJdTtNffaK7uqtVZzqQ7p2xKd2So4Xs/v4cKtjijSMi6c2WfY9xgS4kIsKewSW4VDVOkOFztUpVZHnyh1VrK3tsAzpnib2mcBFeHgDqJ34IQ5ebzJ9v3GeBV0D/KzFKaC6k7GjTIDkZzQl/uRw1Lcajjf4dtA5ysNpCxUDW5Xh8nnKEtaMJqFclsy6Y6EvAVKd9ipXqjIgvky9JN935wuyp3h4xksjgVovu2P4NPBwxsUTtw5jcbdmgDr6uJ/XOAvD7evCQKLvVoEVr+Wl8ipCYTsgZGQziGp+tsYkq9FUlHNRYqKys+58Nu490vB3nsmL+zpIMRwDfdEkBNVdQYg== X-OriginatorOrg: qt.io X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2017 14:17:12.7905 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMSPR02MB229 X-IsSubscribed: yes X-SW-Source: 2017-q2/txt/msg00174.txt.bz2 The mechanism of moving argp_program_version_hook and argp_program_bug_address to .rodata is not portable and two pointers per program are not worth the effort to make it portable. Revert the pointers to be non-const. Signed-off-by: Ulf Hermann --- lib/ChangeLog | 5 +++++ lib/printversion.h | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 59939bd..0433f02 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,5 +1,10 @@ 2017-05-04 Ulf Hermann + * printversion.h: Define ARGP_PROGRAM_VERSION_HOOK_DEF and + ARGP_BUG_ADDRESS_DEF to be non-const and drop the asm tricks. + +2017-05-04 Ulf Hermann + * system.h: Define FILE_SYSTEM_PREFIX_LEN, ISDIRSEP, DIRSEP, PATHSEP, and IS_ABSOLUTE_PATH to help with handling file system paths. diff --git a/lib/printversion.h b/lib/printversion.h index a9e059f..090b53a 100644 --- a/lib/printversion.h +++ b/lib/printversion.h @@ -36,14 +36,10 @@ void print_version (FILE *stream, struct argp_state *state); /* We need define two variables, argp_program_version_hook and - argp_program_bug_address, in all programs. argp.h declares these - variables as non-const (which is correct in general). But we can - do better, it is not going to change. So we want to move them into - the .rodata section. Define macros to do the trick. */ + argp_program_bug_address, in all programs. */ #define ARGP_PROGRAM_VERSION_HOOK_DEF \ - void (*const apvh) (FILE *, struct argp_state *) \ - __asm ("argp_program_version_hook") + void (*argp_program_version_hook) (FILE *, struct argp_state *) #define ARGP_PROGRAM_BUG_ADDRESS_DEF \ - const char *const apba__ __asm ("argp_program_bug_address") + const char *argp_program_bug_address #endif // PRINTVERSION_H -- 2.1.4