From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id D859D3858C78 for ; Fri, 17 Feb 2023 04:40:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D859D3858C78 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31GMi6AZ027089 for ; Fri, 17 Feb 2023 04:40:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=xS/5H2YRNySHDbCx8hAbZDbh+j655wNPBmGizYShxaU=; b=peLmetn76uV0u4dcNU8z922upNkXpJsqQ1PnYuD3ziohu33yzUiIFlaLATH/ZwPR10Ld uJfdEXS0lFWPJvfXa+3bRSSkttgCbEoaaPMz/azepSU0jTrUQOz0C8OU/hRF3LTs9+hR cOScEqQZn7nMpUr+ylC9SoA0tK6OW0Auk05gLkAZka4ECg0IhmukVqGHb+XCOLbzES65 6b0A+tHWizB+Mb6SRDlzNRzdW8EsNy9KRwOlf6EYr86rTDbOKApXm2Cjd1cZfvdXklK9 56dtrLQg7ABMADara9f+h2zl5CJh9Fl/sPu220ABa9eA4IY3f1HfOhV1mtOGnkPUwM9p Gw== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3np2mtn0rk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 17 Feb 2023 04:40:42 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 31H3Fq4L012153 for ; Fri, 17 Feb 2023 04:40:41 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2101.outbound.protection.outlook.com [104.47.55.101]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3np1f9md0m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 17 Feb 2023 04:40:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QJBm5vZgCCrQf5XwSYOLxJlxZrAhviH2bIIKh57xAjpZ/VTdkkukwk890VYGClQrhTJDu6RiAgscrKO4i7/pm6t+oovu7muPSVqYU1VP3cvM+DZFRKKPCiqd5v4HBkO2IdQlLTpSJB4OCDBTnrDNPzTZUQ3RxUL/bO5HFe+MLQp0lIImMNl9kfGh6TQ9PVvx+IswZ83TFsNvIqA3r1Icp6axtGbAGCPApKHTN483f8cP0c1I9OoU8UgUpzG1kCXzPZUPoxWsaxaguwrAaRPEoAOJeTD51lPl6FfOqjQkq63wSY3ISItzVcI5ajoamWIq3LIFMRR+kOLRPoTsLB3S3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xS/5H2YRNySHDbCx8hAbZDbh+j655wNPBmGizYShxaU=; b=GpwcUw/BabvUyw4uH2LV2+S3AThGZi0DZioO/pd6kOGIW+1LE2lNzklXbkKFL48Sko7wEnivaip6BReTqZ9tzCRTY7YZNb+/KVLt4ls+d1qIoyr0W6YNJw6Rl68vspvhiPHhOUEkbp2kBHA/sFC3KAfvgTdej9M2bBJBtmKyhV8CFKaBIDa2HpqcZzuPL1muCO7gsVgZFVfoTxu1clcdIUOEke3XQE3b9kWDVh1LB18tGWDiMKwbNo5dFwAI5irQrVCaCu9uT9xCw2qqkCR9hhuolMxN7l9lslVMWc8eiwAi//OiiKTbX55nosjhLKHdDutMZcL5IAr9oWpwhFszeQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xS/5H2YRNySHDbCx8hAbZDbh+j655wNPBmGizYShxaU=; b=dhrH/8AiZAvsWI5iHFImnp6wxpnhiXGNqxJu82M+Hx0vooQQpFdqEYvOs+uXHLO+qngPOG/FHEN8SuCDqZrBIcozRi7rrjRipb0FVvj0og10Syv8FkCqHrq0dcP9htHIu3c7xFU5urNQDpEdV3M5pSTpgMiXgI84h/5n05ZIkrQ= Received: from PH0PR10MB4629.namprd10.prod.outlook.com (2603:10b6:510:31::10) by PH7PR10MB6404.namprd10.prod.outlook.com (2603:10b6:510:1ae::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.12; Fri, 17 Feb 2023 04:40:39 +0000 Received: from PH0PR10MB4629.namprd10.prod.outlook.com ([fe80::5f6a:4248:9a27:9021]) by PH0PR10MB4629.namprd10.prod.outlook.com ([fe80::5f6a:4248:9a27:9021%4]) with mapi id 15.20.6134.006; Fri, 17 Feb 2023 04:40:39 +0000 From: vladimir.mezentsev@oracle.com To: binutils@sourceware.org Cc: Vladimir Mezentsev Subject: [PATCH 1/2] gprofng: PR30036 Build failure on aarch64 w/ glibc: symbol `pwrite64' is already defined Date: Thu, 16 Feb 2023 20:40:33 -0800 Message-Id: <20230217044033.2131866-1-vladimir.mezentsev@oracle.com> X-Mailer: git-send-email 2.31.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SA0PR11CA0072.namprd11.prod.outlook.com (2603:10b6:806:d2::17) To PH0PR10MB4629.namprd10.prod.outlook.com (2603:10b6:510:31::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR10MB4629:EE_|PH7PR10MB6404:EE_ X-MS-Office365-Filtering-Correlation-Id: 59eb1dd7-3c07-48c2-d0d1-08db10a11e74 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NUKKMStopo7K1OqigCG54OG64qFFDFO1uCwRzK9clsrVoRS72SdUvjXicdKUq0kAG7sYFuS7H02UTYStVj5ltrb+n5aqN07Miu0KpqTdbEQ/77pqtwI7aXQ+jp5uMr4A6m+4T/RVVJncvhWjD5xKfkZl2hHdMMV+3UpwMX0GA5FRN6ykPPOH3EWxOgUst5/vmWlpahdTxepPW62cI1MQnUUD0CPMh6JZ2eBSDN4UzO+IBwjty9hCT7GHcbDFG1wWLoNKrtwrdscJ/3iyc1/g52SziRydbbLefT4+VoqTLxeHafp6VbcM7i5bjEYB8yMGXetMgSsm5J2TJzXtn1jtjfLo/wCllOlFlPejDXQb+wqLmaKXRBM+899XQer6KiMJfSB2FR4B/xbHIIr4yaGNzIlV7rzZae3bg34/+9wnXWjEhCUc5pcYhxWE+frDmVY+ginV1nqmopJ5Hz3T75DmJFinb6FprE5gHlAIb2xpwBNrSB0EuuvqO81mW8yJZfLeY46X+u+poyobEvmtB2kinNpDTEa38ebMrQJD1oF3jgKyLnw5lI0WmY9aPPN+s4llnwCzt/BE1g6WLsAGNXFX+Q9bEftsAV8d+L4d1oBKIMOfPITYHoyCj72BwgiyDJI2nsPizCQq758k/LwS2O4SjbnV15uK0lWWXeN1mOz/bz7go/xG/HusLOpKWW3RzS1E X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR10MB4629.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(136003)(39860400002)(346002)(366004)(396003)(376002)(451199018)(478600001)(6486002)(9686003)(6512007)(186003)(26005)(6666004)(107886003)(316002)(83380400001)(2616005)(6506007)(1076003)(6916009)(66476007)(8676002)(4326008)(66556008)(66946007)(41300700001)(38100700002)(5660300002)(8936002)(2906002)(86362001)(36756003)(81973001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6/ylr58tUR18191zuZvxqQTxls5ZTNbiQbKdm6uro+b75x8laHIMUQtsn0rI?= =?us-ascii?Q?o6zTMxGexh8Vn+STHISe0/Qx85UN9y3foJiftfGesx9WbFe9xXr0viH+ithW?= =?us-ascii?Q?YUSNrl2vv3WDJJQOjZFjoQUAEyiYaPIrYQrRjjpBH1F43yfK/I4JfQRj57ss?= =?us-ascii?Q?EhorjvO10skddy5D6QCDwY7hLu70AYJmObuZ5L86TJbn5b2f8yGk5oP2P6Wl?= =?us-ascii?Q?exWdyF3Zvobau0L3SegoEvFaMvmpMK+6cI8GuQQLYT6Cnu1rd8TNxLlnPyvx?= =?us-ascii?Q?Hc0Vb+MTRbRAiEyKoj38NXt/GrsCYozvqSNtRtquw+hXWsnp5oRPGQd3KoQf?= =?us-ascii?Q?ZV+UHdbUBArJSAmoeVh/G/8VwXV6ySc/r8c3m3lG1EYbnhDWGt2K+pnOC8m0?= =?us-ascii?Q?a3eseQ5V/Ohr1FA0Fi2ehVMsV2HO6d26YAMs4SicqGQMkyaND24tfYVKv+35?= =?us-ascii?Q?/H9WudSOqMtwjZiD0x9/vofZrC1PeGa1MYdtJGsvloxLYhWG75mgIhGX+wXi?= =?us-ascii?Q?BX0eiJ/cNZ6RlwO4x/FEJja6iQ79rdqxyYqfTxZUqxF0zyo1hYemB04iRAMp?= =?us-ascii?Q?lyLVTfxxOTQCSY+/Kqi5lmxUXe8IL+KBajvmWB10wPKlijxbUklYP8ZrztqW?= =?us-ascii?Q?Q++gaRjUGwTQH+AwVT/w5wT2t+si/j6wfPmaiqnZMj9uPTaQtkmwoV0JkMZ2?= =?us-ascii?Q?sglujNqBs1O1aohAqACZnSCNOkT40iIQu8r+zu879pv7o1/g43ioQGQMbNz2?= =?us-ascii?Q?lpjq5+yUKUZOWMX3Tr4TFS9gkI7ExPTUxEHlFVYBlZuILsZInjSD3Vawoozo?= =?us-ascii?Q?L4uGeitstXzpAddm4Jhqrjkq9FpCswmTFWyp9nnxKUmjNIU0zRf/kpqdSlQn?= =?us-ascii?Q?MUo9hHbC/+2WyhCrs7c4iXfApIRDQEOB8ANE4CX4aSycOxqzpcmiVsd1sR+w?= =?us-ascii?Q?49+kyILFhCkknbZFBa3xCVq53UPwzFxwiFpK2vbeaG/uGw5R96A7gvK2V3Nc?= =?us-ascii?Q?keHt/quLCi6ZfboZ9MJnH50t6kMY7XjsZZWqx9o/ZcY5ExbpMRqfIIv6mkru?= =?us-ascii?Q?MnITz2ihUPSySbDCrM3lCBpRL80IvCfeTrz4A3o6K12IYd0P5dHkImozrEyE?= =?us-ascii?Q?Nk55bLife2pI+EPdB/DpdShiEjONxIrm5ul8nmdvwlS3Uw0fquOmNbP9FCV6?= =?us-ascii?Q?V82EyoBwcYCCNHXH3ngaiN2c5V9uC/t7znVVJC8jhTLdnOQL1IHSnMkASBjY?= =?us-ascii?Q?VR7zk3hZ8kOA6In2KSjibGXFEaD4ScFVovFmcaHCHIBlOG7WH0wAaALuYJmv?= =?us-ascii?Q?162i4qkOlr+D/tjygC1MqSFLW6Clmgxm6b+D+ki6ScpcXMA2kyAdCilXSbi4?= =?us-ascii?Q?G71w3WmMRiMmbso/sj5W/9C45g+BTICi7Ov9GDgQLzYQnjQWgPV4URGfzAut?= =?us-ascii?Q?4kVZro35bclmqbNDIuFnOj1Dc8qIFAuqa6qLD+zRTbFQlGvE0Ms83nu7XI0K?= =?us-ascii?Q?BaToyDh52a/1aFx2m1wIO0vVpIEc4yNOGl55vuwbVpPrnYgnQ69/MWCeHJ5K?= =?us-ascii?Q?knaVgsM7/wcJ35WkD5r+MnjhsmFFjykZ5y+RzoI9dSjDE0TBD/EfgSUZPLx8?= =?us-ascii?Q?D1srwYGCHi+JKXXZ2z6xsUA=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 5iFIPhiOtW/+GRf4emeYYethHc1e5SvzPIXF8P2yc3AKXIdSRkBZgnm+pS4rcXUWAz45HxzCq8C4zh7NZOaWOIbUM5VzwKObuf12C+wfVsKo0M3qBLuHP2bgGlxl4oYyyR7i6eA9yMcyfTnZgUysS/dQ7LTngUSg3xj0BeNPMF/4/Dr8HIlmSYjLsYKiW7+E6RyTxk/pSCWsVRamHlQc3dxKDfsYvDHHmRz2Y7YBWBwIt42UgCcQnYbpNEZHYZV1eFK9QzexmLrBSXUBpP2NQ3esym46PyHzNcwZ6i4WswfyWFi6SPMvV3MLqm+ixf0d0zRFpbfVCfL5/DY/e0RcC6LcD7VufMlFRotibTU2lm9amEu8sZuNEgoF4iSOOzahzjTZPAzMf2ib20uq84C/QBTEF1aF+viuD/9OtD6eKjVgI4by8VFGA+yM2wjF0DttGZL9qKKazRBVoZqE6xgM0CqPlaz6lW3FICl9NnJ1RmmRPg0rhMkGafH2MBFK6UfQbBN7bLuYvrGFQb9uV0yEq5HB2CKs44GS4THjTxxn7DuQx5DPDorvjiSJKJt8SSr+xjzZSjQ5WXinNnz4rTDIzC6Tk4cNG4lioW8v4K8y9jP5lJNr4XX1Q74Zb58as4gxNCZ7UhetzqmtAzd9PNpYdZTCYrbBuPIkD3mOh83ohgws6ERtDdOfJ6LoVIbzlaOabcDrp2C8fiV1hRBg+fMnpL5VVAUWNX83Ilz8MhPqpsdGIMoUnDilxTQoE9OBvUL/ X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59eb1dd7-3c07-48c2-d0d1-08db10a11e74 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB4629.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2023 04:40:39.1214 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2Uf59b8ZbS1V1jFbyryoj/rwd7XryH8AYAtjCOXsI1Gq7A/6NN8dRMVFsyId8rzKmE+x8zFwQLiHbeFIFewJHyV3Xe1E410+/fwp+EHDKD0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6404 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-17_01,2023-02-16_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 adultscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302170040 X-Proofpoint-GUID: vmyjSFxm1-f-wKG5IC1nP04WUisK8nDE X-Proofpoint-ORIG-GUID: vmyjSFxm1-f-wKG5IC1nP04WUisK8nDE X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_ASCII_DIVIDERS,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Vladimir Mezentsev gprofng/ChangeLog 2023-02-16 Vladimir Mezentsev PR gprofng/30036 * libcollector/iotrace.c: Define creat64 and pwrite64 only when __USE_LARGEFILE64 and __USE_FILE_OFFSET64 are not defined. * libcollector/mmaptrace.c: Likewise for mmap64. --- gprofng/libcollector/iotrace.c | 15 ++++++++------- gprofng/libcollector/mmaptrace.c | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gprofng/libcollector/iotrace.c b/gprofng/libcollector/iotrace.c index af90cc31f1a..d8439b02b3a 100644 --- a/gprofng/libcollector/iotrace.c +++ b/gprofng/libcollector/iotrace.c @@ -1441,7 +1441,7 @@ creat (const char *path, mode_t mode) } /*------------------------------------------------------------- creat64 */ -#if WSIZE(32) +#if WSIZE(32) && !defined(__USE_LARGEFILE64) int creat64 (const char *path, mode_t mode) { @@ -2476,7 +2476,7 @@ __collector_pwrite_2_1 (int fildes, const void *buf, size_t nbyte, off_t offset) return ret; } -#else +#endif ssize_t pwrite (int fildes, const void *buf, size_t nbyte, off_t offset) { @@ -2497,11 +2497,10 @@ pwrite (int fildes, const void *buf, size_t nbyte, off_t offset) POP_REENTRANCE (guard); return ret; } -#endif /*------------------------------------------------------------- pwrite64 */ -#if WSIZE(32) -#if !defined(__MUSL_LIBC) && ARCH(Intel) +#if WSIZE(32) && ARCH(Intel) +#if !defined(__MUSL_LIBC) // map interposed symbol versions SYMVER_ATTRIBUTE (__collector_pwrite64_2_2, pwrite64@GLIBC_2.2) @@ -2547,8 +2546,9 @@ __collector_pwrite64_2_1 (int fildes, const void *buf, size_t nbyte, off64_t off POP_REENTRANCE (guard); return ret; } +#endif -#else +#if !defined(__USE_FILE_OFFSET64) ssize_t pwrite64 (int fildes, const void *buf, size_t nbyte, off64_t offset) { @@ -2570,7 +2570,8 @@ pwrite64 (int fildes, const void *buf, size_t nbyte, off64_t offset) return ret; } #endif -#endif /* SIZE(32) */ + +#endif /* SIZE(32) && ARCH(Intel) */ /*------------------------------------------------------------- fgets */ char* diff --git a/gprofng/libcollector/mmaptrace.c b/gprofng/libcollector/mmaptrace.c index 61613c21560..221b4e2d176 100644 --- a/gprofng/libcollector/mmaptrace.c +++ b/gprofng/libcollector/mmaptrace.c @@ -1494,7 +1494,7 @@ mmap (void *start, size_t length, int prot, int flags, int fd, off_t offset) } /*------------------------------------------------------------- mmap64 */ -#if WSIZE(32) /* mmap64 only defined for non-64-bit */ +#if WSIZE(32) && !defined(__USE_FILE_OFFSET64) void * mmap64 (void *start, size_t length, int prot, int flags, int fd, off64_t offset) -- 2.31.1