From patchwork Fri Sep 12 10:31:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 37290 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f198.google.com (mail-we0-f198.google.com [74.125.82.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 05F1E206A5 for ; Fri, 12 Sep 2014 10:31:36 +0000 (UTC) Received: by mail-we0-f198.google.com with SMTP id p10sf341780wes.5 for ; Fri, 12 Sep 2014 03:31:36 -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:x-original-sender:x-original-authentication-results; bh=gkWkxjo8Mv2N8GyWsO7QcBD/qXVKT7+fkxc6s4Da/mg=; b=HyNixLN1bYJNXIPiHgxwQB8c2DoEXVicqQWQKhzjBl7RvNXk2E4NNE6iqUjlnkdupw C+FgV8UFbRnl1rSmRcoIiWuv5I3CNxBJeD9RSMU1boxBoMgpJOI0wJB07i1wyuqhzjkJ YNgxPdnBKqJAyZ5rd3jmbWlUCs7Xu9XqvHgq3ft3qW1dbafk2FUWg8DqRsfYkah3P0+O pG7Fv4QV03THjdrKqXYt4D7fyFwl11IlMWlfyKkK50uAOniphJwY0Y1OTZEDjSNAfVjY ldPMqK261l4Lygj+0x9puMiwO6LxFbJKp6x+1rWiy0lHH0ovV/gyL7UFB+bOGqQqE+2m aaIQ== X-Gm-Message-State: ALoCoQnZG3nx1S492s849xQGAffHMAOWUZTeZpJCaNnXCyVr1bWobaa59Zto19xvM0NQVFBBOFHA X-Received: by 10.112.50.47 with SMTP id z15mr487659lbn.19.1410517896093; Fri, 12 Sep 2014 03:31:36 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.10.38 with SMTP id f6ls140404lab.78.gmail; Fri, 12 Sep 2014 03:31:35 -0700 (PDT) X-Received: by 10.152.21.42 with SMTP id s10mr7868168lae.61.1410517895953; Fri, 12 Sep 2014 03:31:35 -0700 (PDT) Received: from mail-lb0-x22a.google.com (mail-lb0-x22a.google.com [2a00:1450:4010:c04::22a]) by mx.google.com with ESMTPS id r1si5686632lag.129.2014.09.12.03.31.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Sep 2014 03:31:32 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::22a as permitted sender) client-ip=2a00:1450:4010:c04::22a; Received: by mail-lb0-f170.google.com with SMTP id c11so632644lbj.29 for ; Fri, 12 Sep 2014 03:31:32 -0700 (PDT) X-Received: by 10.112.76.6 with SMTP id g6mr7562937lbw.22.1410517892161; Fri, 12 Sep 2014 03:31:32 -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.112.141.42 with SMTP id rl10csp705481lbb; Fri, 12 Sep 2014 03:31:31 -0700 (PDT) X-Received: by 10.69.18.202 with SMTP id go10mr10873117pbd.84.1410517890544; Fri, 12 Sep 2014 03:31:30 -0700 (PDT) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id cf1si3282796pdb.231.2014.09.12.03.31.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Sep 2014 03:31:30 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-52768-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 9214 invoked by alias); 12 Sep 2014 10:31:19 -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 9196 invoked by uid 89); 12 Sep 2014 10:31:18 -0000 X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=no version=3.3.2 X-HELO: mail-we0-f182.google.com X-Received: by 10.180.187.7 with SMTP id fo7mr1162815wic.58.1410517874612; Fri, 12 Sep 2014 03:31:14 -0700 (PDT) From: Will Newton To: libc-alpha@sourceware.org Subject: [PATCH] ARM: Don't define _SYS_AUXV_H in sysdep.h Date: Fri, 12 Sep 2014 11:31:08 +0100 Message-Id: <1410517868-11916-1-git-send-email-will.newton@linaro.org> X-Original-Sender: will.newton@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::22a as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@sourceware.org X-Google-Group-Id: 836684582541 sysdep.h was defining _SYS_AUXV_H in order to avoid an include guard check in hwcap.h. Unfortunately it didn't undefine it so it could leak out into code and caused a build failure with -Wimplicit-function-declaration building tst-auxv on ARM. ChangeLog: 2014-09-11 Will Newton * sysdeps/unix/sysv/linux/arm/bits/hwcap.h: Check for _LINUX_ARM_SYSDEP_H include guard too. * sysdeps/unix/sysv/linux/arm/sysdep.h (_SYS_AUXV_H): Remove define. --- sysdeps/unix/sysv/linux/arm/bits/hwcap.h | 2 +- sysdeps/unix/sysv/linux/arm/sysdep.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/arm/bits/hwcap.h b/sysdeps/unix/sysv/linux/arm/bits/hwcap.h index cd8f93c..2ddc5a6 100644 --- a/sysdeps/unix/sysv/linux/arm/bits/hwcap.h +++ b/sysdeps/unix/sysv/linux/arm/bits/hwcap.h @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#ifndef _SYS_AUXV_H +#if !defined (_SYS_AUXV_H) && !defined (_LINUX_ARM_SYSDEP_H) # error "Never include directly; use instead." #endif diff --git a/sysdeps/unix/sysv/linux/arm/sysdep.h b/sysdeps/unix/sysv/linux/arm/sysdep.h index 52e27d0..91bdca5 100644 --- a/sysdeps/unix/sysv/linux/arm/sysdep.h +++ b/sysdeps/unix/sysv/linux/arm/sysdep.h @@ -40,7 +40,6 @@ #undef SYS_ify #define SYS_ify(syscall_name) (__NR_##syscall_name) -#define _SYS_AUXV_H 1 #include #ifdef __ASSEMBLER__