From patchwork Fri Nov 18 22:30:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 126488 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]) by ozlabs.org (Postfix) with SMTP id 7058CB7210 for ; Sat, 19 Nov 2011 09:31:16 +1100 (EST) Received: (qmail 3687 invoked by alias); 18 Nov 2011 22:31:14 -0000 Received: (qmail 3674 invoked by uid 22791); 18 Nov 2011 22:31:13 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, FROM_12LTRDOM X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 18 Nov 2011 22:30:58 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=EU1-MAIL.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1RRWxV-0007fj-5z from joseph_myers@mentor.com for gcc-patches@gcc.gnu.org; Fri, 18 Nov 2011 14:30:57 -0800 Received: from digraph.polyomino.org.uk ([172.16.63.104]) by EU1-MAIL.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.1830); Fri, 18 Nov 2011 22:30:54 +0000 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.74) (envelope-from ) id 1RRWxS-0003nm-E3 for gcc-patches@gcc.gnu.org; Fri, 18 Nov 2011 22:30:54 +0000 Date: Fri, 18 Nov 2011 22:30:54 +0000 (UTC) From: "Joseph S. Myers" To: gcc-patches@gcc.gnu.org Subject: Fix gcc.dg/cpp/assert4.c for non-GNU Linux systems Message-ID: MIME-Version: 1.0 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org The testcase gcc.dg/cpp/assert4.c, which tests that #system(linux) is true if and only if __gnu_linux__ is defined, wasn't updated for the changes associated with Android support that arranged for __linux__ to be defined for all systems with the Linux kernel but __gnu_linux__ only to be defined for systems using some form of glibc (not counting uClibc) with that kernel. I've applied this patch to make the test test __linux__ instead of __gnu_linux__. Tested x86_64-unknown-linux-gnu. 2011-11-18 Joseph Myers * gcc.dg/cpp/assert4.c: Test __linux__, not __gnu_linux__. Index: gcc.dg/cpp/assert4.c =================================================================== --- gcc.dg/cpp/assert4.c (revision 181494) +++ gcc.dg/cpp/assert4.c (working copy) @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2006, 2008 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2006, 2008, 2009, 2011 Free Software Foundation, Inc. Test builtin preprocessor assertions. By Kaveh Ghazi . */ @@ -7,7 +7,7 @@ /* Check for #system assertions. */ -#if defined __gnu_linux__ +#if defined __linux__ # if !#system(linux) || !#system(unix) || !#system(posix) # error # endif