From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <fweimer@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [216.205.24.124])
 by sourceware.org (Postfix) with ESMTP id DFB29385480F
 for <libc-alpha@sourceware.org>; Fri, 18 Jun 2021 09:36:50 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DFB29385480F
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-235-9NnozWvHNrK00PjZod0Kew-1; Fri, 18 Jun 2021 05:36:49 -0400
X-MC-Unique: 9NnozWvHNrK00PjZod0Kew-1
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
 [10.5.11.14])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0A195100C662;
 Fri, 18 Jun 2021 09:36:48 +0000 (UTC)
Received: from oldenburg.str.redhat.com (ovpn-115-60.ams2.redhat.com
 [10.36.115.60])
 by smtp.corp.redhat.com (Postfix) with ESMTPS id 310295D9C0;
 Fri, 18 Jun 2021 09:36:46 +0000 (UTC)
From: Florian Weimer <fweimer@redhat.com>
To: Siddhesh Poyarekar via Libc-alpha <libc-alpha@sourceware.org>
Cc: Siddhesh Poyarekar <siddhesh@sourceware.org>
Subject: Re: [PATCH] malloc: Clean up __malloc_initialized
References: <20210618090945.721332-1-siddhesh@sourceware.org>
Date: Fri, 18 Jun 2021 11:36:45 +0200
In-Reply-To: <20210618090945.721332-1-siddhesh@sourceware.org> (Siddhesh
 Poyarekar via Libc-alpha's message of "Fri, 18 Jun 2021 14:39:45
 +0530")
Message-ID: <875yybsedu.fsf@oldenburg.str.redhat.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux)
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Type: text/plain
X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH,
 DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0,
 RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,
 SPF_PASS, TXREP 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 <libc-alpha.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/libc-alpha>,
 <mailto:libc-alpha-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/libc-alpha>,
 <mailto:libc-alpha-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Jun 2021 09:36:52 -0000

* Siddhesh Poyarekar via Libc-alpha:

> -/* In the GNU libc we rename the global variable
> -   `__malloc_initialized' to `__libc_malloc_initialized'.  */
> -#define __malloc_initialized __libc_malloc_initialized
> -/* Nonzero if the malloc is already initialized.  */
> -extern int __malloc_initialized attribute_hidden;

You need to provide the attribute_hidden somewhere, otherwise you'll get
worse code on some targets.

> diff --git a/malloc/mcheck.c b/malloc/mcheck.c
> index 2a1fc645d4..93d7992a41 100644
> --- a/malloc/mcheck.c
> +++ b/malloc/mcheck.c
> @@ -21,6 +21,7 @@
>  # define _MALLOC_INTERNAL
>  # include <malloc.h>
>  # include <mcheck.h>
> +# include <stdbool.h>
>  # include <stdint.h>
>  # include <stdio.h>
>  # include <libintl.h>
> @@ -372,10 +373,12 @@ mabort (enum mcheck_status status)
>  int
>  mcheck (void (*func) (enum mcheck_status))
>  {
> +  extern bool __malloc_initialized;
> +

This suggests that __malloc_initialized should remain in the wrapper
header.

Thanks,
Florian