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 92E433858010 for ; Tue, 4 Oct 2022 16:17:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 92E433858010 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.5/8.17.1.5) with ESMTP id 294FxQLq017833 for ; Tue, 4 Oct 2022 16:17:28 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=SJxnQPh1hZc2P5u6wR9YrQyrqot2norBnfPQWyXzsQ4=; b=befSeG1ymvGpCZ5snBUEc8BLxHGwStUNH2xy2u1Q9L63xmj4/BqzEBJ5b0JxBzzXeQH8 lJl/1kg89v3LDVMstQzaAF7gRKAIhWsWdSxRGsxVrmRYxTPqq6lsOK3maHLBZQkRbq2I 5m0vvIbzaVwe2CwKMY924UT70pCdvswvtZYEMo9r8KV7NEBE2Qt12OfVxIfq4YDOmkOJ WIn4K9L90hnbMcgz2jAHrcpt+s2UaivJA2UyYiwNn5NG7s2oq3VkshYY01xGRmqiCDpQ SQUdoIerOjB53ks6JYhO/3NrSe7tlDd4pnqhLM/uvYdT//HBA6e8/3dOAtVQIDDR7Wbh QQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3jxd5tev95-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 04 Oct 2022 16:17:27 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 294GApur033922 for ; Tue, 4 Oct 2022 16:17:27 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2168.outbound.protection.outlook.com [104.47.58.168]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3jxc04cjs4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 04 Oct 2022 16:17:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J9shlgolTLUBrBS17ErinlwCam1EOgZ2VyRHvm0egFG4e3rwJCpflGEGOTc37ustLjir0ABXEpvjv/dMxSmRsG911N5k8cMeD97Stl/Y/MiyELUxVIMvSTlQvdRhu1d9DNstB2J//GsNQK+CSmYBw7nanD4Q3JdbwveqLJEDcobP34mOkvQNcs6iMKEfkq+QrtbDE7C3nGCrN3sP06lVHcgkq09y38kGN0xBiEhnzXTX9P09dAinbwrzLZ1FF0pivL8MW4ayVOhg35/nVPEZXenV6PsQFqw6brAOR0oYvptVtArA0dcFLOZJyIfy/VmveMpi1QZ7CwNIRyZYF5aItA== 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=SJxnQPh1hZc2P5u6wR9YrQyrqot2norBnfPQWyXzsQ4=; b=OfrSttpMO9CDl5ZZmTrqqi9aa1tShOqylEwDfh85+hsgQ1Gqa9NDu9CozFRhaWV7ZAkgcJOhbboG02gdWR00KZMbnIt79z0Hv2y3tTjTjZ8jjO0RwvG8wtk6m+NqVIPO9razUGAXupSckzBneyfM8WyDvMl2fzUw9i30HPS5rbenyiaFouXYCIgZoH6wKAqPSl/mLU6mlG7scNK0qbCEwS/8Jlc3Brzvl2DF8k3q77oRj3kRf7MX8Yl2ugrwJOR3wRqR8dtjkkIbW7e8kbZl1JwF7imQt/FwLsPrdq3pIVoIZFcodO81WvKnILui/mhAuJwsCmLOSne8Lye9VyUJKQ== 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=SJxnQPh1hZc2P5u6wR9YrQyrqot2norBnfPQWyXzsQ4=; b=Y2vi35zTcpk0QSiMJY3sLecewtyJ0+hYUPyapb2eKoFyVf16/4lKF6jK/Sdirn5wjt3IlPDce/PXiPQPptNBDcuZ9l+/OEtBoj/EroZir95fcmbx87/ReKRdy08fNjkZ6jI8m9xfL5H9MZxHJLm6+S/7MPYnQZPQjrv3ZOU2yuw= Received: from SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) by SA2PR10MB4505.namprd10.prod.outlook.com (2603:10b6:806:112::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.28; Tue, 4 Oct 2022 16:17:25 +0000 Received: from SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::989:999c:4e86:6f69]) by SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::989:999c:4e86:6f69%5]) with mapi id 15.20.5676.031; Tue, 4 Oct 2022 16:17:25 +0000 From: vladimir.mezentsev@oracle.com To: binutils@sourceware.org Cc: Vladimir Mezentsev Subject: [PATCH] gprofng: fix build with --enable-pgo-build=lto Date: Tue, 4 Oct 2022 09:17:20 -0700 Message-Id: <20221004161720.1963953-1-vladimir.mezentsev@oracle.com> X-Mailer: git-send-email 2.31.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: DM6PR08CA0032.namprd08.prod.outlook.com (2603:10b6:5:80::45) To SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PR10MB4636:EE_|SA2PR10MB4505:EE_ X-MS-Office365-Filtering-Correlation-Id: 7dcff927-7341-4548-0814-08daa623ec8d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P4gE6y2uJCZvnHXFHQ+0rWnXnGdxHjKqdT7SujZ3OGFyDGHa25VrysaFOitY46wOtZNEP4bxDB2Fy5VcKjMIn3D5eksNM4RcnaYqTFner2t/LZmIdwEdZqltV3DUPFCf5N5F5x97mX5EwEomrvTV05zhi7MLKu1VqB8ku4LGyRK3wJtvGn7Y2k8TDrrVdkr3fLRaCQyPLHckE8K1U6XSkwpxWzUtDhl7FixzJYEwYj+bVVxEZSx0UphWrVoyu5duuffepp/me/cPLNCf/7S5KEQ5obpcbL8sEXoaDio5xx5cqZPOku8q42UaXrH8qmwuDSkrXkIcvEp2fYDhk2At1Ax3keKwSrx0ZAa9rYsapiAirGXXFIEwO2Ym6fhyVmwvPkxolJ+mNQtYXB6qq40kkhz5FNJwU1+ewwQU8r0tR8UJVZLjPmJPEX0tRqA59RKmMw40OiLMgNbI5JUiuU7rEo+4/2seohJaIRhshdiKwS166IhVNQt2lVSrvmlCa32Z11ENt0oRFI75RYk6+qLoeN0GOIbw6k/s1B60Xw7EF3a9XE/vSWY5DS6mJ3QzNKHCaax5Mf9OEk9Ay08PVj4i3KNtpXTVpMKm7c0HTbiZ1UJRJb/F0grlMATwBjuH8i3NZ7NhH7MAsY2CiL+WOIQEhHxPjBkXN40wZ9F0TZCsqgeU0UfB7/DJJUGU1/Tqcr7XjI5ntxw0/eHCenHiYhpfNw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SA2PR10MB4636.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(346002)(136003)(376002)(366004)(451199015)(478600001)(66556008)(36756003)(316002)(2616005)(186003)(1076003)(8936002)(2906002)(5660300002)(8676002)(4326008)(66476007)(66946007)(6666004)(107886003)(6506007)(6916009)(6512007)(26005)(9686003)(6486002)(30864003)(86362001)(83380400001)(41300700001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OcP+5w8PIgORl6i7F+uPN5Zb541ajHdLy6h9tmQ1jkjp6pTzlZzaxsBQ2MFH?= =?us-ascii?Q?P6NlR8vRcKCDlT/QvMypdRXoj6I4xVnVVpQOUguELzB2veaw4dwJ9+jXtacV?= =?us-ascii?Q?I5zG7KHuOxotVJeEQ2Z6zOdUSz4JVGbVLQUY0hD9b6D/+b4QacFqn1fakeRn?= =?us-ascii?Q?zVomZsfWQ3QQ5K58rNDzPxFJPQDnr+p8m8GGIS8qO5gA88HFFl0AdfXaGxPC?= =?us-ascii?Q?yPLE1sYp4ksWRMvnIsd1z+ch5O9EjsZsjOnl54XWM+YSGkQMAsMu72wgaaLm?= =?us-ascii?Q?WaTRU2YvwHp8RS11qc6Bhx5ORELtn3eacZkjhxs/ftlW/298sMRCqFjYuzZt?= =?us-ascii?Q?nWTUQDUu8HSjVtcLI7l8yfJhNd7i23m/MtE516spQGTd81ytmdqHKmAxiLnl?= =?us-ascii?Q?6VPYJI6spBV+9mT49cJpDD9X8FP/0iQapBwYp4DKjvZQFrYkCxX2xlmDzHZG?= =?us-ascii?Q?WWRS2LIfmUTJFJhiTDXbNG9n7kA3WgetpCdkthoqlRjBAU0e3FceOA9Jcv+q?= =?us-ascii?Q?GBzaXQdjbGV/LODlmSMl6QWmzMnOogqq4QC4stLGpGz+XENufFUs96Wx7Lbk?= =?us-ascii?Q?3SJpKz2EqWbT14HsX6WC5LNwPtNHAQG4OLAS2TlNlXwrJlC/t0YexDpgRqdU?= =?us-ascii?Q?F5bCwUWNn8qWNpDJcRptijokqIv8MnGknmAF4Opk0RFBepBlE6bFcgHwhbj4?= =?us-ascii?Q?FRfVrC81iWdu0KtrCJR8uNoeJCyJcM4ayOGDuN5QU9pf4lLQslMAwao/V+Tj?= =?us-ascii?Q?3WnpSAOjpheY1vWDXn7/I7ilm7bqecIb/nwHnngbec6PWAtXhFbzAD/XArL/?= =?us-ascii?Q?Vq2OLhNOdIMajIawNJeF9AH/KUxIXdCCAzkYIHzMe+/QaxSh+XBC0eBbchjX?= =?us-ascii?Q?5dgdz+iYnwke4hA7DHgDyElAqDBiHdmA7ARcwZlMCJSatdNQC0bL1Z4F8O3h?= =?us-ascii?Q?ua3SjwqwPhMWF8MtDCOFttPZOOXPNbm4/eE+P1yR/2CxAELEABJTCdFgXNh+?= =?us-ascii?Q?aVlJXIihKNXyeWJ03H5uKz/7xoxgV99IqjIjILNAxRNtoAZe1Ip6XWIr9GrB?= =?us-ascii?Q?HiE/G2KX4evOscsU1j/5Yc/sPev5QBZkl86vmFlxr7JrEYXDpUxvhJGR/jd9?= =?us-ascii?Q?mbGc0FLZU8i30B1unrFfrKvGAUwCEZEouFG5fU2iJT+evPVL+S5XAvv2c0/x?= =?us-ascii?Q?Tg/hzepSomX0HbOzuAmajrVWJINgSfi92s4xewkMnbavSB/88qR9+i3UTlAg?= =?us-ascii?Q?+9dIPduIFQT2K31qh4avA9PcwE6NYtvz7EWDwJdGrJvsYJYZiVhXJRXMUTp0?= =?us-ascii?Q?N3MB6uCsVimNPPfOkpgDCBm0fc0oz6Lc3NNiXJ7MoaLnoiZLVuizckT/w48M?= =?us-ascii?Q?Sp/NWoo+M7DBKXGyRD98CaF2N88y3xC5whSeli+4kvg3Yj1qFgOCBLk8tt1G?= =?us-ascii?Q?YcTBNUwNXSahdcYBhgFyNHadjyM6kDN2T/GvXsEwcVek+C1pqXf9PECrBZ/y?= =?us-ascii?Q?fhpK6twq3recsURMXXmRgrFS+yyTAy9pnMocbScoUa0hIVz90aYSXD1CZbPb?= =?us-ascii?Q?OZHv0Wu/iviUL7zeQv02RCuvhSi9eQiDz075EICAA+YHYn+lUW95aXdBHIQS?= =?us-ascii?Q?Rw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: AI8wHZnQhWMLzBiNc+bx9Pn+5RiPe2mD8hVewz6wzajhJWer+lmensf7zlG3s4pSpd5YXDbUmnRNllIfZxRrqs3LzeJwZHJlw6KpJgTJCbwkiqEbdDYN5dQsu4q+nPGqP7oh4cwQo88qP7JTAxSeZFiAQxHsmRsVyrYkgqViREL5Ukh1tONp4g/VHJqejcnpzG4LxLjdnCpbettd819EXquPL6shv8OMupIZzqDpVsi02XWhFqngHaoYKJrO1C7o+wqCTjV/18IuGshy3SpXCfhVLsNvWajKPAiMzKww2ornuyKoASybXiQ4R5WYTW+9YuADfQgT2Q/V07bPar+8XQV20qrAd7S/3rveV3TxsNYrTSWNwkTz0kp0GABOaBPLZULI3gAkwmrBpEmskdxpDwRqXLgz9JVtleBJbJ41s8Y8onEp+X96HyLUC5DHGU7078hE/6AQWcs7maU0YRvi5TE1q0JZMkRF4e6RqFfFJmCJTxb29WvXlkyLdLHtV48Ohq6c7pZJagLQG4gU+DXqMpuX4JT0mHL4jSm7xfGpZnr0s81HwSnTalcIYsKt6LT02kD+Yf4vSf6iDLhtQaj/P/vVgGKPtCEuXI9W1FciNwd7OCglVZvXGZN0CahoTgojs/PyB5RYhLFoQGLXQMfCQeCGHG4ohEIj/h0pSxx813Bi05ymPq1i+qA24KKxSaX3i7HeeOXqLeMsSUC6JtfowNMkGd2vlL8bw1oYfqN+pFgAd5H3jq0sIEJZWEcRxL/j X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7dcff927-7341-4548-0814-08daa623ec8d X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4636.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2022 16:17:25.1734 (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: KPt5DI2qrciT6FkO6Pec/8YTwkwEcNT1NZDrlkah51Xz/Qj6fRiDHHBbPFIs2ZNhtzJnDFqlN/5x3NccvMsdQQeUlEAyv1fMyb4LlW46GS4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4505 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-10-04_06,2022-09-29_03,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 phishscore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 mlxscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2210040105 X-Proofpoint-ORIG-GUID: kDzBq853up0ezVYH-nXKTYvwHCZHFhcO X-Proofpoint-GUID: kDzBq853up0ezVYH-nXKTYvwHCZHFhcO X-Spam-Status: No, score=-12.1 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 2022-10-04 Vladimir Mezentsev PR gprofng/29579 * libcollector/dispatcher.c: Fix the symbol version in SYMVER_ATTRIBUTE. * libcollector/iotrace.c: Likewise. * libcollector/linetrace.c: Likewise. * libcollector/mmaptrace.c: Likewise. * libcollector/synctrace.c: Likewise. --- gprofng/libcollector/dispatcher.c | 4 ++-- gprofng/libcollector/iotrace.c | 32 ++++++++++++++++--------------- gprofng/libcollector/linetrace.c | 8 ++++---- gprofng/libcollector/mmaptrace.c | 8 ++++---- gprofng/libcollector/synctrace.c | 6 +++--- 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/gprofng/libcollector/dispatcher.c b/gprofng/libcollector/dispatcher.c index d3e4c52d667..d0e8f84ec48 100644 --- a/gprofng/libcollector/dispatcher.c +++ b/gprofng/libcollector/dispatcher.c @@ -818,7 +818,7 @@ static int __collector_timer_create_symver (int(real_timer_create) (), clockid_t clockid, struct sigevent *sevp, timer_t *timerid); -SYMVER_ATTRIBUTE (__collector_timer_create_2_3_3, timer_create@@GLIBC_2.3.3) +SYMVER_ATTRIBUTE (__collector_timer_create_2_3_3, timer_create@GLIBC_2.3.3) int __collector_timer_create_2_3_3 (clockid_t clockid, struct sigevent *sevp, timer_t *timerid) @@ -1078,7 +1078,7 @@ __collector_pthread_create_symver (int(real_pthread_create) (), void *(*func)(void*), void *arg); -SYMVER_ATTRIBUTE (__collector_pthread_create_2_1, pthread_create@@GLIBC_2.1) +SYMVER_ATTRIBUTE (__collector_pthread_create_2_1, pthread_create@GLIBC_2.1) int __collector_pthread_create_2_1 (pthread_t *thread, const pthread_attr_t *attr, diff --git a/gprofng/libcollector/iotrace.c b/gprofng/libcollector/iotrace.c index d94daefa89b..e7e8afa307d 100644 --- a/gprofng/libcollector/iotrace.c +++ b/gprofng/libcollector/iotrace.c @@ -1085,7 +1085,7 @@ static int __collector_open64_symver (int(real_open64) (const char *, int, ...), const char *path, int oflag, mode_t mode); -SYMVER_ATTRIBUTE (__collector_open64_2_2, open64@@GLIBC_2.2) +SYMVER_ATTRIBUTE (__collector_open64_2_2, open64@GLIBC_2.2) int __collector_open64_2_2 (const char *path, int oflag, ...) { @@ -1650,7 +1650,7 @@ close (int fildes) static FILE* __collector_fopen_symver (FILE*(real_fopen) (), const char *filename, const char *mode); -SYMVER_ATTRIBUTE (__collector_fopen_2_1, fopen@@GLIBC_2.1) +SYMVER_ATTRIBUTE (__collector_fopen_2_1, fopen@GLIBC_2.1) FILE* __collector_fopen_2_1 (const char *filename, const char *mode) { @@ -1762,7 +1762,7 @@ fopen (const char *filename, const char *mode) static int __collector_fclose_symver (int(real_fclose) (), FILE *stream); -SYMVER_ATTRIBUTE (__collector_fclose_2_1, fclose@@GLIBC_2.1) +SYMVER_ATTRIBUTE (__collector_fclose_2_1, fclose@GLIBC_2.1) int __collector_fclose_2_1 (FILE *stream) { @@ -1886,7 +1886,7 @@ fflush (FILE *stream) static FILE* __collector_fdopen_symver (FILE*(real_fdopen) (), int fildes, const char *mode); -SYMVER_ATTRIBUTE (__collector_fdopen_2_1, fdopen@@GLIBC_2.1) +SYMVER_ATTRIBUTE (__collector_fdopen_2_1, fdopen@GLIBC_2.1) FILE* __collector_fdopen_2_1 (int fildes, const char *mode) { @@ -2354,7 +2354,7 @@ fwrite (const void *ptr, size_t size, size_t nitems, FILE *stream) static int __collector_pread_symver (int(real_pread) (), int fildes, void *buf, size_t nbyte, off_t offset); -SYMVER_ATTRIBUTE (__collector_pread_2_2, pread@@GLIBC_2.2) +SYMVER_ATTRIBUTE (__collector_pread_2_2, pread@GLIBC_2.2) int __collector_pread_2_2 (int fildes, void *buf, size_t nbyte, off_t offset) { @@ -2432,7 +2432,7 @@ pread (int fildes, void *buf, size_t nbyte, off_t offset) #if !defined(__MUSL_LIBC) && ARCH(Intel) && WSIZE(32) // map interposed symbol versions -SYMVER_ATTRIBUTE (__collector_pwrite_2_2, pwrite@@GLIBC_2.2) +SYMVER_ATTRIBUTE (__collector_pwrite_2_2, pwrite@GLIBC_2.2) int __collector_pwrite_2_2 (int fildes, const void *buf, size_t nbyte, off_t offset) { @@ -2475,8 +2475,8 @@ __collector_pwrite_2_1 (int fildes, const void *buf, size_t nbyte, off_t offset) POP_REENTRANCE (guard); return ret; } -#endif /* !defined(__MUSL_LIBC) && ARCH(Intel) && WSIZE(32) */ +#else ssize_t pwrite (int fildes, const void *buf, size_t nbyte, off_t offset) { @@ -2497,13 +2497,14 @@ pwrite (int fildes, const void *buf, size_t nbyte, off_t offset) POP_REENTRANCE (guard); return ret; } +#endif /*------------------------------------------------------------- pwrite64 */ -#if !defined(__MUSL_LIBC) -#if ARCH(Intel) && WSIZE(32) +#if WSIZE(32) +#if !defined(__MUSL_LIBC) && ARCH(Intel) // map interposed symbol versions -SYMVER_ATTRIBUTE (__collector_pwrite64_2_2, pwrite64@@GLIBC_2.2) +SYMVER_ATTRIBUTE (__collector_pwrite64_2_2, pwrite64@GLIBC_2.2) ssize_t __collector_pwrite64_2_2 (int fildes, const void *buf, size_t nbyte, off64_t offset) { @@ -2546,8 +2547,8 @@ __collector_pwrite64_2_1 (int fildes, const void *buf, size_t nbyte, off64_t off POP_REENTRANCE (guard); return ret; } -#endif +#else ssize_t pwrite64 (int fildes, const void *buf, size_t nbyte, off64_t offset) { @@ -2569,6 +2570,7 @@ pwrite64 (int fildes, const void *buf, size_t nbyte, off64_t offset) return ret; } #endif +#endif /* SIZE(32) */ /*------------------------------------------------------------- fgets */ char* @@ -3252,7 +3254,7 @@ ftell (FILE *stream) static int __collector_fgetpos_symver (int(real_fgetpos) (), FILE *stream, fpos_t *pos); -SYMVER_ATTRIBUTE (__collector_fgetpos_2_2, fgetpos@@GLIBC_2.2) +SYMVER_ATTRIBUTE (__collector_fgetpos_2_2, fgetpos@GLIBC_2.2) int __collector_fgetpos_2_2 (FILE *stream, fpos_t *pos) { @@ -3337,7 +3339,7 @@ fgetpos (FILE *stream, fpos_t *pos) static int __collector_fgetpos64_symver (int(real_fgetpos64) (), FILE *stream, fpos64_t *pos); -SYMVER_ATTRIBUTE (__collector_fgetpos64_2_2, fgetpos64@@GLIBC_2.2) +SYMVER_ATTRIBUTE (__collector_fgetpos64_2_2, fgetpos64@GLIBC_2.2) int __collector_fgetpos64_2_2 (FILE *stream, fpos64_t *pos) { @@ -3419,7 +3421,7 @@ fgetpos64 (FILE *stream, fpos64_t *pos) static int __collector_fsetpos_symver (int(real_fsetpos) (), FILE *stream, const fpos_t *pos); -SYMVER_ATTRIBUTE (__collector_fsetpos_2_2, fsetpos@@GLIBC_2.2) +SYMVER_ATTRIBUTE (__collector_fsetpos_2_2, fsetpos@GLIBC_2.2) int __collector_fsetpos_2_2 (FILE *stream, const fpos_t *pos) { @@ -3502,7 +3504,7 @@ fsetpos (FILE *stream, const fpos_t *pos) static int __collector_fsetpos64_symver (int(real_fsetpos64) (), FILE *stream, const fpos64_t *pos); -SYMVER_ATTRIBUTE (__collector_fsetpos64_2_2, fsetpos64@@GLIBC_2.2) +SYMVER_ATTRIBUTE (__collector_fsetpos64_2_2, fsetpos64@GLIBC_2.2) int __collector_fsetpos64_2_2 (FILE *stream, const fpos64_t *pos) { diff --git a/gprofng/libcollector/linetrace.c b/gprofng/libcollector/linetrace.c index a209308c767..d67a66a3734 100644 --- a/gprofng/libcollector/linetrace.c +++ b/gprofng/libcollector/linetrace.c @@ -1355,7 +1355,7 @@ __collector_posix_spawn_symver (int(real_posix_spawn) (), const posix_spawnattr_t *attrp, char *const argv[], char *const envp[]); -SYMVER_ATTRIBUTE (__collector_posix_spawn_2_15, posix_spawn@@GLIBC_2.15) +SYMVER_ATTRIBUTE (__collector_posix_spawn_2_15, posix_spawn@GLIBC_2.15) int __collector_posix_spawn_2_15 (pid_t *pidp, const char *path, const posix_spawn_file_actions_t *file_actions, @@ -1465,7 +1465,7 @@ __collector_posix_spawnp_symver (int(real_posix_spawnp) (), pid_t *pidp, const posix_spawnattr_t *attrp, char *const argv[], char *const envp[]); -SYMVER_ATTRIBUTE (__collector_posix_spawnp_2_15, posix_spawnp@@GLIBC_2.15) +SYMVER_ATTRIBUTE (__collector_posix_spawnp_2_15, posix_spawnp@GLIBC_2.15) int // Common interposition __collector_posix_spawnp_2_15 (pid_t *pidp, const char *path, const posix_spawn_file_actions_t *file_actions, @@ -1597,7 +1597,7 @@ __collector_system (const char *cmd) static FILE * __collector_popen_symver (FILE*(real_popen) (), const char *cmd, const char *mode); -SYMVER_ATTRIBUTE (__collector_popen_2_1, popen@@GLIBC_2.1) +SYMVER_ATTRIBUTE (__collector_popen_2_1, popen@GLIBC_2.1) FILE * __collector_popen_2_1 (const char *cmd, const char *mode) { @@ -1617,7 +1617,7 @@ __collector_popen_2_0 (const char *cmd, const char *mode) return __collector_popen_symver (CALL_REALF (popen_2_0), cmd, mode); } -SYMVER_ATTRIBUTE (__collector__popen_2_1, _popen@@GLIBC_2.1) +SYMVER_ATTRIBUTE (__collector__popen_2_1, _popen@GLIBC_2.1) FILE * __collector__popen_2_1 (const char *cmd, const char *mode) { diff --git a/gprofng/libcollector/mmaptrace.c b/gprofng/libcollector/mmaptrace.c index bd299e6f64f..867fead2feb 100644 --- a/gprofng/libcollector/mmaptrace.c +++ b/gprofng/libcollector/mmaptrace.c @@ -1600,20 +1600,20 @@ dlopen (const char *pathname, int mode) { if (NULL_PTR (dlopen)) init_mmap_intf (); - void* caller = __builtin_return_address (0); // must be called inside dlopen first layer interpostion + void* caller = __builtin_return_address (0); // must be called inside dlopen first layer interposition return __collector_dlopen_symver (CALL_REAL (dlopen), caller, pathname, mode); } #if !defined(__MUSL_LIBC) && ((ARCH(Intel) && WSIZE(32)) || ARCH(SPARC)) // map interposed symbol versions -SYMVER_ATTRIBUTE (__collector_dlopen_2_1, dlopen@@GLIBC_2.1) +SYMVER_ATTRIBUTE (__collector_dlopen_2_1, dlopen@GLIBC_2.1) void * __collector_dlopen_2_1 (const char *pathname, int mode) { if (NULL_PTR (dlopen_2_1)) init_mmap_intf (); - void *caller = __builtin_return_address (0); // must be called inside dlopen first layer interpostion + void *caller = __builtin_return_address (0); // must be called inside dlopen first layer interposition return __collector_dlopen_symver (CALL_REAL (dlopen_2_1), caller, pathname, mode); } @@ -1623,7 +1623,7 @@ __collector_dlopen_2_0 (const char *pathname, int mode) { if (NULL_PTR (dlopen_2_0)) init_mmap_intf (); - void* caller = __builtin_return_address (0); // must be called inside dlopen first layer interpostion + void* caller = __builtin_return_address (0); // must be called inside dlopen first layer interposition return __collector_dlopen_symver (CALL_REAL (dlopen_2_0), caller, pathname, mode); } #endif diff --git a/gprofng/libcollector/synctrace.c b/gprofng/libcollector/synctrace.c index d48aeaa2d2d..39210f53e40 100644 --- a/gprofng/libcollector/synctrace.c +++ b/gprofng/libcollector/synctrace.c @@ -759,7 +759,7 @@ __collector_pthread_cond_wait_symver (int(real_pthread_cond_wait) (), pthread_co #if ARCH(Intel) || ARCH(SPARC) SYMVER_ATTRIBUTE (__collector_pthread_cond_wait_2_3_2, - pthread_cond_wait@@GLIBC_2.3.2) + pthread_cond_wait@GLIBC_2.3.2) #endif int __collector_pthread_cond_wait_2_3_2 (pthread_cond_t *cond, pthread_mutex_t *mutex) @@ -852,7 +852,7 @@ __collector_pthread_cond_timedwait_symver (int(real_pthread_cond_timedwait) (), #if ARCH(Intel) || ARCH(SPARC) SYMVER_ATTRIBUTE (__collector_pthread_cond_timedwait_2_3_2, - pthread_cond_timedwait@@GLIBC_2.3.2) + pthread_cond_timedwait@GLIBC_2.3.2) #endif // ARCH() int __collector_pthread_cond_timedwait_2_3_2 (pthread_cond_t *cond, @@ -984,7 +984,7 @@ pthread_join (pthread_t target_thread, void **status) static int __collector_sem_wait_symver (int(real_sem_wait) (), sem_t *sp); -SYMVER_ATTRIBUTE (__collector_sem_wait_2_1, sem_wait@@GLIBC_2.1) +SYMVER_ATTRIBUTE (__collector_sem_wait_2_1, sem_wait@GLIBC_2.1) int __collector_sem_wait_2_1 (sem_t *sp) { -- 2.31.1