From patchwork Thu Jun 17 18:56:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 43885 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 9757F393D02D for ; Thu, 17 Jun 2021 18:58:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9757F393D02D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1623956327; bh=yZKYK95z8IamHBXAXb0Qe+IG7/hheZMu7KGmvx5UAk4=; 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=haOclFUoQpNRdYdvDVm3ndq+GBPuQECsVmzItC6YAjHBIB2SUEaHnK892So/okaty EP+qbklmZXBV18JyWJgQeprW9KIwdxAREm0ORNXxM+y3Pk/6QkzpIsZWlBtZW5RxMh sNbNfQb1zTlXzazqnVJ8IKwDacw727Kl8W86iWng= 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 EDAD738515E7 for ; Thu, 17 Jun 2021 18:56:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EDAD738515E7 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-380-hcNnnC6gMAiy0XC-8esRCA-1; Thu, 17 Jun 2021 14:56:57 -0400 X-MC-Unique: hcNnnC6gMAiy0XC-8esRCA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 948C579EDD for ; Thu, 17 Jun 2021 18:56:56 +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 1375260C03 for ; Thu, 17 Jun 2021 18:56:55 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 02/34] Fix librt-routines-var issues for !PTHREAD_IN_LIBC In-Reply-To: References: X-From-Line: 79d494dbcefe3a86a60db3c29396c6db7fe74d14 Mon Sep 17 00:00:00 2001 Message-Id: <79d494dbcefe3a86a60db3c29396c6db7fe74d14.1623956057.git.fweimer@redhat.com> Date: Thu, 17 Jun 2021 20:56:54 +0200 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.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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 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+patchwork=sourceware.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 6482a43025..407df9e6a1 100644 --- a/Makeconfig +++ b/Makeconfig @@ -1344,7 +1344,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 b0d887202d..47bc594dee 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 \