From patchwork Thu Dec 9 23:04:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 75008 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 7984BB7080 for ; Fri, 10 Dec 2010 10:04:34 +1100 (EST) Received: (qmail 9143 invoked by alias); 9 Dec 2010 23:04:33 -0000 Received: (qmail 9134 invoked by uid 22791); 9 Dec 2010 23:04:32 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL, BAYES_00, TW_XG, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 09 Dec 2010 23:04:26 +0000 Received: (qmail 7092 invoked from network); 9 Dec 2010 23:04:24 -0000 Received: from unknown (HELO digraph.polyomino.org.uk) (joseph@127.0.0.2) by mail.codesourcery.com with ESMTPA; 9 Dec 2010 23:04:24 -0000 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.72) (envelope-from ) id 1PQpXD-0000iN-DO; Thu, 09 Dec 2010 23:04:23 +0000 Date: Thu, 9 Dec 2010 23:04:23 +0000 (UTC) From: "Joseph S. Myers" To: gcc-patches@gcc.gnu.org cc: matt@3am-software.com Subject: svr4.h avoidance: vax 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 This patch in the series removing svr4.h from the headers used by particular targets in GCC stops vax-*-linux* from using that header, adding the macros used from it to vax/linux.h. Tested building cc1 and xgcc for cross to vax-linux-gnu. OK to commit? 2010-12-09 Joseph Myers * config/vax/linux.h (WCHAR_TYPE, WCHAR_TYPE_SIZE): Define. * config.gcc (vax-*-linux*): Don't use svr4.h. Index: gcc/config.gcc =================================================================== --- gcc/config.gcc (revision 167658) +++ gcc/config.gcc (working copy) @@ -2633,7 +2633,7 @@ v850-*-*) use_gcc_stdint=wrap ;; vax-*-linux*) - tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h vax/elf.h vax/linux.h" + tm_file="${tm_file} dbxelf.h elfos.h linux.h vax/elf.h vax/linux.h" tmake_file="${tmake_file} vax/t-linux" ;; vax-*-netbsdelf*) Index: gcc/config/vax/linux.h =================================================================== --- gcc/config/vax/linux.h (revision 167658) +++ gcc/config/vax/linux.h (working copy) @@ -46,3 +46,9 @@ along with GCC; see the file COPYING3. %{rdynamic:-export-dynamic} \ -dynamic-linker /lib/ld.so.1} \ %{static:-static}}" + +#undef WCHAR_TYPE +#define WCHAR_TYPE "long int" + +#undef WCHAR_TYPE_SIZE +#define WCHAR_TYPE_SIZE BITS_PER_WORD