From patchwork Mon Mar 17 12:23:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 26351 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E96C7202FA for ; Mon, 17 Mar 2014 12:24:14 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id wp18sf22033334obc.8 for ; Mon, 17 Mar 2014 05:24:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:mailing-list :precedence:list-id:list-unsubscribe:list-subscribe:list-archive :list-post:list-help:sender:delivered-to:from:to:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results; bh=H1ZmS+hpnzdw6m8cqdOa8OScpooQq5Hi+ZtAKsIGfIY=; b=i2pMi9/PxchZBH4tV0HSrL//rktFg0u6Zhwlqjz5Gt2a1m2+N/Tvj/mwIfhfFmQt0N rcL5NiRL4E+fPDpOow/hzinFyuJr4NNa7jF+TY+xeSdD4hiGcw3De2ixTj7n++wygCGg +I4+Q1lcio/NwQtuOya2YeA1Y+lcRQBRam8j1PWBsD1tB8pmheFx3yCrhgBTXh0vu5GU +RsJAAvPfY7zQImVciEl4Q+7lQFdpPOTytASALfamN+i1AQABO/wk4nkrZTwOk9fkOwK EfKwIAl9Qyqy+YH/WfmBvE4y1BLiuitO+/ptVYvejtLUabKNvdaHFDWS1+ai7KrCSm4+ zgxA== X-Gm-Message-State: ALoCoQlW3Te4EkdKrCiTHEYavXgmh7Nt1bvn74mmrdiJi/m3RsKQ2yRZAtJPrL+Ko9Y+iVTSMMpq X-Received: by 10.182.125.134 with SMTP id mq6mr4363204obb.1.1395059054173; Mon, 17 Mar 2014 05:24:14 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.92.133 with SMTP id b5ls1681487qge.38.gmail; Mon, 17 Mar 2014 05:24:14 -0700 (PDT) X-Received: by 10.58.170.69 with SMTP id ak5mr580361vec.28.1395059054027; Mon, 17 Mar 2014 05:24:14 -0700 (PDT) Received: from mail-vc0-x22d.google.com (mail-vc0-x22d.google.com [2607:f8b0:400c:c03::22d]) by mx.google.com with ESMTPS id sv2si1710615vdc.21.2014.03.17.05.24.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Mar 2014 05:24:13 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c03::22d is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c03::22d; Received: by mail-vc0-f173.google.com with SMTP id il7so5721606vcb.32 for ; Mon, 17 Mar 2014 05:24:13 -0700 (PDT) X-Received: by 10.59.7.170 with SMTP id dd10mr19378181ved.12.1395059053908; Mon, 17 Mar 2014 05:24:13 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp123165vck; Mon, 17 Mar 2014 05:24:13 -0700 (PDT) X-Received: by 10.66.180.200 with SMTP id dq8mr25554439pac.104.1395059052894; Mon, 17 Mar 2014 05:24:12 -0700 (PDT) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id zm8si9873972pac.194.2014.03.17.05.24.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Mar 2014 05:24:12 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-48211-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 18880 invoked by alias); 17 Mar 2014 12:23:40 -0000 Mailing-List: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Precedence: list 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 18753 invoked by uid 89); 17 Mar 2014 12:23:37 -0000 X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-we0-f175.google.com X-Received: by 10.180.13.11 with SMTP id d11mr1644405wic.3.1395059011885; Mon, 17 Mar 2014 05:23:31 -0700 (PDT) From: Will Newton To: libc-alpha@sourceware.org Subject: [PATCH 3/7] Fix HP_SMALL_TIMING_AVAIL -Wundef warnings Date: Mon, 17 Mar 2014 12:23:20 +0000 Message-Id: <1395059004-20960-3-git-send-email-will.newton@linaro.org> In-Reply-To: <1395059004-20960-1-git-send-email-will.newton@linaro.org> References: <1395059004-20960-1-git-send-email-will.newton@linaro.org> X-Original-Sender: will.newton@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c03::22d is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@sourceware.org X-Google-Group-Id: 836684582541 ChangeLog: 2014-03-17 Will Newton * sysdeps/generic/ldsodefs.h: Check whether HP_SMALL_TIMING_AVAIL is defined with #ifdef rather than #if. --- sysdeps/generic/ldsodefs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 65cd709..d61b9f9 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -322,7 +322,7 @@ struct rtld_global /* The object to be initialized first. */ EXTERN struct link_map *_dl_initfirst; -#if HP_TIMING_AVAIL || HP_SMALL_TIMING_AVAIL +#if HP_TIMING_AVAIL || defined HP_SMALL_TIMING_AVAIL /* Start time on CPU clock. */ EXTERN hp_timing_t _dl_cpuclock_offset; #endif @@ -535,7 +535,7 @@ struct rtld_global_ro /* All search directories defined at startup. */ EXTERN struct r_search_path_elem *_dl_init_all_dirs; -#if HP_TIMING_AVAIL || HP_SMALL_TIMING_AVAIL +#if HP_TIMING_AVAIL || defined HP_SMALL_TIMING_AVAIL /* Overhead of a high-precision timing measurement. */ EXTERN hp_timing_t _dl_hp_timing_overhead; #endif