From patchwork Thu Mar 4 16:31:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 1447435 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=VHYTE1YG; dkim-atps=neutral Received: from sourceware.org (unknown [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DrxFj58R4z9sW4 for ; Fri, 5 Mar 2021 03:31:21 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C51C63AA9C61; Thu, 4 Mar 2021 16:31:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C51C63AA9C61 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1614875479; bh=hose+zZJ95LUiT3koZgOVz0kDepJeevCD2ZiuEcMo0Q=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=VHYTE1YGuhftvZtXXCysawsCiPr7IOpnjYjAA9fzbmFmw+mBS//M25HVb4/Z0oTeF MtmDdt3kvny0BalZ9ht/P8hd9tTNGXtlUx29gUSvH6aXJ/glVqjK2QuRVwWAtGYEA8 +Q4j3sOH9jhQ/9nHjxrTnACaQHbzknFxGK7nHcwI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60065.outbound.protection.outlook.com [40.107.6.65]) by sourceware.org (Postfix) with ESMTPS id D2AD2388E834 for ; Thu, 4 Mar 2021 16:31:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D2AD2388E834 Received: from AM5PR1001CA0013.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:206:2::26) by AM0PR08MB5361.eurprd08.prod.outlook.com (2603:10a6:208:18d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17; Thu, 4 Mar 2021 16:31:15 +0000 Received: from AM5EUR03FT008.eop-EUR03.prod.protection.outlook.com (2603:10a6:206:2:cafe::47) by AM5PR1001CA0013.outlook.office365.com (2603:10a6:206:2::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17 via Frontend Transport; Thu, 4 Mar 2021 16:31:15 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; sourceware.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;sourceware.org; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT008.mail.protection.outlook.com (10.152.16.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17 via Frontend Transport; Thu, 4 Mar 2021 16:31:14 +0000 Received: ("Tessian outbound dd71fb35fd76:v71"); Thu, 04 Mar 2021 16:31:14 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: b17278a8abb70124 X-CR-MTA-TID: 64aa7808 Received: from 8511735d0ee6.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id F25F9E83-7CB1-45F2-A6D3-117F6DFE4D21.1; Thu, 04 Mar 2021 16:31:08 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 8511735d0ee6.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 04 Mar 2021 16:31:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mjn/CTZZBm421FWIv3ERkS+avLtSfI4p1brQ0kYKSKzTbDL4FvSpJT9wL3oDde7kfUkEWkTQHaJ/mcb3gHPd5oNdWziVAN8htUoKvzSabc8jgAMOgzDj8zprGA1xqGMFBaUDk0KiXpfonN0QxlQJcqH+d8JDzJrCC1JAz8WX04evWels99Q3e3spciyghdF/Ko+NR4Z/YfGTgkfy+X49hNzvRf7dcxn8hJMxB0EzYV6PhZ6mzYsHTLElHz959yu0nKCmPmkMRxoQ8FQWAClscI57CCepnJnAESw/oLvnoDvUjv9aOb/PQinTvjPdLKIJawkrVOy3coNHe9pEU19C2A== 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-SenderADCheck; bh=hose+zZJ95LUiT3koZgOVz0kDepJeevCD2ZiuEcMo0Q=; b=UsbFPklZ9quzLijPxUHEn530PRWB2s9/H1EFXrkr20f7IKUJ4v8AtqqyCz9KqITsGWVJj8yZ1AcL6hZE1zYPs1sp+Y9ga4ahaUbtNKRRlZnbRNdfk9SSyHyu7Il4T5n+yVlGVhp9XsMv4vWJy3mBfwF35iYLj6DsJTcraeys3J4PCV4k+r13UuaZz5egWewXxqqbPmOZpLjovkzVRshjNGmqlO/tGJbpguoWx5CTHVTzpRDR4hBuKsb6Y5h1vtfYicur4sBnVk1nVgY9907CQW8tBsPkwL8LW8R+aElgjaEFphjPAgKPyYKKt8tnBlZe0WvUru+ryt2TGAC0HH7yFg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Authentication-Results-Original: sourceware.org; dkim=none (message not signed) header.d=none;sourceware.org; dmarc=none action=none header.from=arm.com; Received: from PA4PR08MB6320.eurprd08.prod.outlook.com (2603:10a6:102:e5::9) by PAXPR08MB6381.eurprd08.prod.outlook.com (2603:10a6:102:151::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17; Thu, 4 Mar 2021 16:31:07 +0000 Received: from PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::60f0:3773:69b8:e336]) by PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::60f0:3773:69b8:e336%2]) with mapi id 15.20.3912.021; Thu, 4 Mar 2021 16:31:07 +0000 To: libc-alpha@sourceware.org, Richard.Earnshaw@arm.com, DJ Delorie Subject: [PATCH 03/16] malloc: Move MTAG_MMAP_FLAGS definition Date: Thu, 4 Mar 2021 16:31:01 +0000 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [217.140.106.55] X-ClientProxiedBy: LO4P123CA0058.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:153::9) To PA4PR08MB6320.eurprd08.prod.outlook.com (2603:10a6:102:e5::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (217.140.106.55) by LO4P123CA0058.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:153::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17 via Frontend Transport; Thu, 4 Mar 2021 16:31:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5323bd48-8131-471c-fcba-08d8df2aedfc X-MS-TrafficTypeDiagnostic: PAXPR08MB6381:|AM0PR08MB5361: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:8882;OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: AhSi1FgDPFD9EjDDmdx+G+W212hI3ryIrJ69Ac36hCnc7/MT+dn/F0v7mcFXpKk29NTGfeI0/1gIyO8e9iNars3uN+x4UMTVV6io+LFnn1MFAKCEB4dVjRvIGjV8+5I0+IbPZf3WLq8dXkAcjAjTsBKto3HwTURE5hO1FhVj50NuhpjHktJUneGHjpOuaRUGcCRUZXholknX9ArsYjmyBkrEUnsfzVxIFHJPdjNVBNh0jSwCdcJ2zxY3KH2kLytWt/6nmCpgfhtZdEarhyfZ10p32yAHCSnxM5S6qD5DjfBh+JPb+qR5552SjdgXfZTTznoeOgsAOn50voXpNMx75I6GvGq3hFpmTbdP6Ym25TIcYRZQ3nn5ql7x0VLUNsaPK1x6sXmecTMpUBLVx6vMFRfv0+lZRrvYL/zcJQl0kO0YeLY+zlGlTjmYYUVWkqjK8JgEd33hsEqHRToQgnDVUFelUiG6ylEgNRlX14kUp+OcjSbmLgOjB9Uqf8sOu43XM9kv6dCADMHqwgaC3oRgpPtuljYaGH/0m8nim8CBUhVO7TSti8FpEEZ3+8UFtuflMsfSHiGmpKBTbAOPSSmkAA== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PA4PR08MB6320.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(396003)(39850400004)(346002)(366004)(136003)(66476007)(83380400001)(66556008)(26005)(6666004)(5660300002)(52116002)(66946007)(8936002)(36756003)(6506007)(86362001)(6486002)(8676002)(316002)(2906002)(16526019)(186003)(44832011)(478600001)(6916009)(6512007)(69590400012)(956004)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: JlUS8gRceM+9eC/73g/BugQzAugKJrL3FqcS5N+yWmp6jqFO+YbBXYs5y5rdOPxK/F7pieDvrCjHRN/7X+BwdZ48lRDqnDBZSicIiP5VWT0OhRT902XuEYbiZNcn2fm/KRK9o+rsh3eKLH+IQroD0/tQyMw9PLVNmzfHujb+YgGLp/65LcbV6PLzdH+kxJYJzADAnjdNVK7CMFdPu+S7Yn7TxrFfdqp5N/kVi9zj9o9V+5PM9HyDcXEmPGRAX94FUrfdyEpSBkmFml+dcSxwdl0OhftAxjVxlfjvjYQo5o+z3Bz5hSgxVal/9OGQX6SOpjf91DonBjcRCeMTTU5Zdi+sUul75XI93WzP3iHXKma7wIOMVPNZsjtk/1Y/PA48MRAyFcxgTfzrtL3YZFhRcpxgQwWvfjV43Wrr9TNQX2YtcFhckAnTDuco02SzksyuY+hQ9h/mZO1MF4DnJgVu0Q7k+ddYBUYW5SMKSJqjF5wi0rGo6ynkjyntCXq3SRghm+oj3Yi92vaztZ7BggS/3HNZTuCnHgJJVM+1LfDigtk0/LNuXoBm7AJMCDSvDTNPa4sDItdN2deyXkhrbP5g/25mFweY/aN+8U3HWeWHVuv/umXc3LHUagB0wp8Wj32aPHEeAstD1L2ugpez/OvWvATs+Zx8CM6+K59La3/3TgowTEURgzi28tinbL7IH1ZAZ1ISJiAiMrLSM+68y04XDBYRY2xyovCatKkFjmqqocaTBiLa78qNpVQPytZW8uG290pZWlG2UpY25pMFjkzplZGiXY/oPz4mPVANY4Oa33ujQQTMzgUUYEA05DOMGTF8266PLcwSL5CSb628V5ca0h3vuwJoo71erGctJ8Q0sh0Ku83mkz99P9wji3gTmn/+yM9hLV6s/QxdHAl1vvUNVHiYgggYM2tuGChoHgoNxk01oLOvyUGKhSXMs17Dc1LyggDLATxIUlHRF+lE097iBSrRhbKBKjQBE/Fd9Zv2nknChwlM+BLNJ9TSmpwmOZBfsFskQ4P/XkuNO3snzNEZdIK8MYI3klF9pO7hb/MIrh+iTWQg1yOTjhEyQpV6H2bAP0i9ERfGw4aBoK01fGiUOkUpGuA/jdF4tSXNrHHfB1tY00dx0u/6iz/bmuV3fyqYZ5iVljuTBACQ+rMRzhZy7LITYJfSKVcVcJhQHN+FsFvY1r29MDtYBwt5FiexMnIv39in2324noKg514KGI4PhMZRl9apzP80qt5E7MfvDBszfcnNi6U0WHTc5ciplb3tJap4ev+ci2B3MDCJBu4nJkX6VbG+/0WLvMXXQ75hO/bsYGRmOJbSFQJbbrzqmByo X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6381 Original-Authentication-Results: sourceware.org; dkim=none (message not signed) header.d=none; sourceware.org; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT008.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 4c7e3dec-b345-4a89-6133-08d8df2ae990 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LL+IuVOJ09tLH5hNxXz5vIIRlorRQDBLgDH/be+JfiCcVTox2qgk6A8duH4ninWJxrrjtBty+c5Dh6WtUPfGapHpJEpkb/FeNkykmg5lzNTfDeNpNjKWSkq7JzFso52wKLW8e/qu8kI4JcP4gtZOfmSuNU/54zE7lemsvn6CK1vryosyqjReDpsmz4yHBvEaCf4oFV7A6kwMsm8Av4euIqbl5PYbJo3qlG9MplcJ3/LjQ45kiwQIDsz2bdxshunDZtFK5kCz4DDkkAPlVwtFY9GQJ3HiSTVt2wW1fabciXIz3teYV1GtIl7TJ9hGD/4D6H/dNB9YcKtvfzkr4JU/FduzMg+Qcw2ecXCNPZtgOvXF/1gbIk7jUM96TEe49yPeLkHaipWRP3TCCOBB3q3dFH7yBj7sjlmmpNAfA+WZNneQg8XoBLYqEAjfsjee1mi8tyihwoAJsyefEeMNyQ4kXk1FkUEQpIIm3NVC5j5rOJRITp+vLXzsQiXKBXyltmsLT4P1kj+SJDKYqAj1S1PIiao/Q5ofDRMWdyt0aJTIy13/+khAUApWF7of5utuEMB3ww0d0E6xmsKtrddxahxpegE5c90SUBKZZY4sCmmlUoKMhPepIn0YNz+XATSIYepavAoTV4UznjzgFr0F1L8ZEbQL8OLfuXkyZOsa3EhVcNTZ0KL0Qt+3iXpbUcYu5rOk X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(4636009)(39850400004)(396003)(136003)(346002)(376002)(36840700001)(46966006)(956004)(2906002)(47076005)(44832011)(2616005)(8936002)(36756003)(336012)(316002)(6486002)(8676002)(6512007)(478600001)(26005)(82740400003)(186003)(16526019)(83380400001)(356005)(5660300002)(81166007)(6862004)(70586007)(70206006)(6666004)(86362001)(6506007)(82310400003)(36860700001)(69590400012); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2021 16:31:14.6675 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5323bd48-8131-471c-fcba-08d8df2aedfc X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT008.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB5361 X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Szabolcs Nagy via Libc-alpha From: Szabolcs Nagy Reply-To: Szabolcs Nagy Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This is only used internally in malloc.c, the extern declaration was wrong, __mtag_mmap_flags has internal linkage. --- include/malloc.h | 7 ------- malloc/malloc.c | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/malloc.h b/include/malloc.h index 7ae08d53d3..b77761f74d 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -16,11 +16,4 @@ typedef struct malloc_state *mstate; # endif /* !_ISOMAC */ -#ifdef USE_MTAG -extern int __mtag_mmap_flags; -#define MTAG_MMAP_FLAGS __mtag_mmap_flags -#else -#define MTAG_MMAP_FLAGS 0 -#endif - #endif diff --git a/malloc/malloc.c b/malloc/malloc.c index 10ea6aa441..4538a01614 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -463,11 +463,13 @@ static void *(*__tag_region)(void *, size_t) = __default_tag_region; static void *(*__tag_new_usable)(void *) = __default_tag_nop; static void *(*__tag_at)(void *) = __default_tag_nop; +# define MTAG_MMAP_FLAGS __mtag_mmap_flags # define TAG_NEW_MEMSET(ptr, val, size) __tag_new_memset (ptr, val, size) # define TAG_REGION(ptr, size) __tag_region (ptr, size) # define TAG_NEW_USABLE(ptr) __tag_new_usable (ptr) # define TAG_AT(ptr) __tag_at (ptr) #else +# define MTAG_MMAP_FLAGS 0 # define TAG_NEW_MEMSET(ptr, val, size) memset (ptr, val, size) # define TAG_REGION(ptr, size) (ptr) # define TAG_NEW_USABLE(ptr) (ptr)