From patchwork Thu Aug 21 10:57:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 381911 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 23F9714008F for ; Thu, 21 Aug 2014 20:59:29 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=EokFZ6gpTOZ8IbqiFyI7tQaAehqgwEL YwKzmZ2rjrytjxdg+OOiWwDkN/QYdRDif7fgkqpvfOyIn5ZYwpHaWrWqUJE5uyAP NQ7TVA3R0QZOtcVONH6DWr5+OTZaXLVndIkzU55Q2aW3WfeGpiyviGgZ+ROGDlE9 iof5mX+DDxOs= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=i78+J47Q6YSuZlecYeQZUCn2ZT0=; b=T7EDN k9rrsSKaAwciwCl7Xnk+jigm593+bibXd3tJnfVAgxQQWuI60AFF8CoUGgKYzb92 mVIOx1BOoks61sSXMiGguA+MG/3Pb7aaBq92bmOBpX8g+gm138mWrr7iUiDGTE+T hhOR8og7CP8dRgnVXbkzEjWXIn3fdJ9V+bT3kk= Received: (qmail 17035 invoked by alias); 21 Aug 2014 10:58:20 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 16952 invoked by uid 89); 21 Aug 2014 10:58:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.8 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Cc: Siddhesh Poyarekar Subject: [PATCH 08/19] Remove IS_IN_ldconfig Date: Thu, 21 Aug 2014 16:27:32 +0530 Message-Id: <1408618663-2281-9-git-send-email-siddhesh@redhat.com> In-Reply-To: <1408618663-2281-1-git-send-email-siddhesh@redhat.com> References: <1408618663-2281-1-git-send-email-siddhesh@redhat.com> Replace with IS_IN(). No change in generated code. * elf/Makefile (CFLAGS-ldconfig.c): Remove definition of IS_IN_ldconfig. * sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c: Use IS_IN. * sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h: Likewise. --- elf/Makefile | 2 +- sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c | 2 +- sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/elf/Makefile b/elf/Makefile index d93898f..2781cc3 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -432,7 +432,7 @@ $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ - -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1 -DNOT_IN_libc=1 + -D'SLIBDIR="$(slibdir)"' -DNOT_IN_libc libof-ldconfig = ldconfig CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) CFLAGS-cache.c = $(SYSCONF-FLAGS) diff --git a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c index 6662a94..8ac351e 100644 --- a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c +++ b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c @@ -1,4 +1,4 @@ -#ifdef IS_IN_ldconfig +#if IS_IN (ldconfig) # include #else # include diff --git a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h index 3145520..7829e1c 100644 --- a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h @@ -1,4 +1,4 @@ -#ifdef IS_IN_ldconfig +#if IS_IN (ldconfig) # include #else # include