From patchwork Wed Feb 17 17:21:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 42089 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5BCA8394740E; Wed, 17 Feb 2021 17:21:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5BCA8394740E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1613582475; bh=QDwYlU2VWFQs+JLtG/XvAr8v9o6D3ul2HnUfkFgbME4=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=jI3l4GTQrvJVawAfxQ1ZuzN5eCn0NjaWzEd32uXbzf6IrY6qUsBpfyM/1BuFRzK95 n3PLaSc6+/uJnedl23AaziRq4JabApXW3uGXsOozZjBKyhwI6A/TctVyEi0Isp/TC3 mZgxpQHR3plXFgbCmnJG3SN8/kxk8ACmyd5QaAt0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id 5C77C394740B for ; Wed, 17 Feb 2021 17:21:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5C77C394740B 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-452-2rfUyUF6Nuu6s7w-IzWOsA-1; Wed, 17 Feb 2021 12:21:08 -0500 X-MC-Unique: 2rfUyUF6Nuu6s7w-IzWOsA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D683485B6C0 for ; Wed, 17 Feb 2021 17:21:07 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-131.ams2.redhat.com [10.36.113.131]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3B3BA5C3E4 for ; Wed, 17 Feb 2021 17:21:07 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 3/6] nptl: Move futex-internal.c into main nptl directory In-Reply-To: References: Message-Id: <95d86eec9a14e2453a06114a7d91d64d8be18289.1613582255.git.fweimer@redhat.com> Date: Wed, 17 Feb 2021 18:21:39 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" --- nptl/Makefile | 3 +++ {sysdeps/nptl => nptl}/futex-internal.c | 0 sysdeps/nptl/Makefile | 3 +-- 3 files changed, 4 insertions(+), 2 deletions(-) rename {sysdeps/nptl => nptl}/futex-internal.c (100%) Reviewed-by: Adhemerval Zanella diff --git a/nptl/Makefile b/nptl/Makefile index 94c3873623..5a7558d943 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -97,6 +97,7 @@ libpthread-routines = \ flockfile \ ftrylockfile \ funlockfile \ + futex-internal \ herrno \ libpthread-compat \ lowlevellock \ @@ -314,6 +315,8 @@ CFLAGS-fsync.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-pt-system.c += -fexceptions +CFLAGS-futex-internal.c += -fexceptions -fasynchronous-unwind-tables + LDLIBS-tst-once5 = -lstdc++ CFLAGS-tst-thread_local1.o = -std=gnu++11 LDLIBS-tst-thread_local1 = -lstdc++ diff --git a/sysdeps/nptl/futex-internal.c b/nptl/futex-internal.c similarity index 100% rename from sysdeps/nptl/futex-internal.c rename to nptl/futex-internal.c diff --git a/sysdeps/nptl/Makefile b/sysdeps/nptl/Makefile index bdba75d85f..adcced422b 100644 --- a/sysdeps/nptl/Makefile +++ b/sysdeps/nptl/Makefile @@ -17,8 +17,7 @@ # . ifeq ($(subdir),nptl) -libpthread-sysdep_routines += errno-loc futex-internal -CFLAGS-futex-internal.c += -fexceptions -fasynchronous-unwind-tables +libpthread-sysdep_routines += errno-loc endif ifeq ($(subdir),rt)