From patchwork Thu Jun 3 23:14:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1487497 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=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@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=xD9mHwMe; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 4Fx1xy3w2Mz9sRN for ; Fri, 4 Jun 2021 09:17:10 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 72E50399041B for ; Thu, 3 Jun 2021 23:17:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 72E50399041B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1622762228; bh=gAdrvj8i8zBWg+V8ZkTC8sRTYH0oTDDL1RglKwjitv4=; 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=xD9mHwMeCffjPaRoAJvUJ3yaa0/b8ZGUZTaMiGviupOB6F1noOex290mQpPCCBDyU ZEqpoiUygu4ZbPIGtAxzJh8RQVmtzKw7STIAhuY80C+6/xLKQna6hybXrspDAQaAQa 6XkADDsPd+OdIifQHNias5JKSxiMXe3pJwrhpr4g= 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 [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 323EE3886C7E for ; Thu, 3 Jun 2021 23:15:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 323EE3886C7E 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-66-fqCTMLBNMWy8520_SYoH0g-1; Thu, 03 Jun 2021 19:15:00 -0400 X-MC-Unique: fqCTMLBNMWy8520_SYoH0g-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 74DB0180FD67 for ; Thu, 3 Jun 2021 23:14:59 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-228.ams2.redhat.com [10.36.113.228]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9166A1002EF0 for ; Thu, 3 Jun 2021 23:14:58 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 02/35] Fix librt-routines-var issues for !PTHREAD_IN_LIBC In-Reply-To: References: X-From-Line: ad0e4a8507f02f459d9a02c8f954b159df6702c3 Mon Sep 17 00:00:00 2001 Message-Id: Date: Fri, 04 Jun 2021 01:14:56 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.7 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 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+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" The variable name was incorrect, and the existing librt-routines variable needs to be augmented (not assigned) in rt/Makefile. Reviewed-by: Adhemerval Zanella --- Makeconfig | 2 +- rt/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makeconfig b/Makeconfig index c3496452b6..6a334fa296 100644 --- a/Makeconfig +++ b/Makeconfig @@ -1330,7 +1330,7 @@ libpthread-routines-var = routines librt-routines-var = routines else libpthread-routines-var = libpthread-routines -librt-routines-var = libpthread-routines +librt-routines-var = librt-routines endif # A sysdeps Makeconfig fragment may set libc-reentrant to yes. diff --git a/rt/Makefile b/rt/Makefile index d19314b7dc..baec51b40a 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -57,7 +57,7 @@ librt-routines = \ timer_gettime \ timer_settime \ -$(librt-routines-var) = \ +$(librt-routines-var) += \ tests := tst-shm tst-timer tst-timer2 \ tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \