From patchwork Thu Dec  9 17:13:17 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Joseph Myers <joseph@codesourcery.com>
X-Patchwork-Id: 74948
Return-Path: 
 <gcc-patches-return-280687-incoming=patchwork.ozlabs.org@gcc.gnu.org>
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 0AF93B7080
	for <incoming@patchwork.ozlabs.org>;
	Fri, 10 Dec 2010 04:13:33 +1100 (EST)
Received: (qmail 10949 invoked by alias); 9 Dec 2010 17:13:29 -0000
Received: (qmail 10907 invoked by uid 22791); 9 Dec 2010 17:13:26 -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 17:13:20 +0000
Received: (qmail 9594 invoked from network); 9 Dec 2010 17:13:18 -0000
Received: from unknown (HELO digraph.polyomino.org.uk) (joseph@127.0.0.2) by
	mail.codesourcery.com with ESMTPA; 9 Dec 2010 17:13:18 -0000
Received: from jsm28 (helo=localhost)	by digraph.polyomino.org.uk with
	local-esmtp (Exim 4.72)	(envelope-from
	<joseph@codesourcery.com>)	id 1PQk3R-0007Nt-Fa;
	Thu, 09 Dec 2010 17:13:17 +0000
Date: Thu, 9 Dec 2010 17:13:17 +0000 (UTC)
From: "Joseph S. Myers" <joseph@codesourcery.com>
To: gcc-patches@gcc.gnu.org
cc: dj@redhat.com
Subject: svr4.h avoidance: mep
Message-ID: <Pine.LNX.4.64.1012091712120.22364@digraph.polyomino.org.uk>
MIME-Version: 1.0
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
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 mep-*-* from using svr4.h.  The macros
used from that header are added to mep.h.

Tested building cc1 and xgcc for cross to mep-elf.  OK to commit?

2010-12-09  Joseph Myers  <joseph@codesourcery.com>

	* config/mep/mep.h (SIZE_TYPE, PTRDIFF_TYPE, WCHAR_TYPE,
	WCHAR_TYPE_SIZE): Define.
	* config.gcc (mep-*-*): Don't use svr4.h.

diff -rupN --exclude=.svn gcc-mainline-3/gcc/config/mep/mep.h gcc-mainline/gcc/config/mep/mep.h
--- gcc-mainline-3/gcc/config/mep/mep.h	2010-11-22 05:28:24.000000000 -0800
+++ gcc-mainline/gcc/config/mep/mep.h	2010-12-09 08:46:16.000000000 -0800
@@ -202,6 +202,18 @@ crtbegin.o%s"
 #define DOUBLE_TYPE_SIZE      64
 #define LONG_DOUBLE_TYPE_SIZE 64
 #define DEFAULT_SIGNED_CHAR    1
+
+#undef  SIZE_TYPE
+#define SIZE_TYPE "unsigned int"
+
+#undef  PTRDIFF_TYPE
+#define PTRDIFF_TYPE "int"
+
+#undef  WCHAR_TYPE
+#define WCHAR_TYPE "long int"
+
+#undef  WCHAR_TYPE_SIZE
+#define WCHAR_TYPE_SIZE BITS_PER_WORD
 
 /* Register numbers:
  	0..15	core registers
diff -rupN --exclude=.svn gcc-mainline-3/gcc/config.gcc gcc-mainline/gcc/config.gcc
--- gcc-mainline-3/gcc/config.gcc	2010-12-09 05:50:25.000000000 -0800
+++ gcc-mainline/gcc/config.gcc	2010-12-09 08:45:52.000000000 -0800
@@ -1762,7 +1762,7 @@ mcore-*-pe*)
 	use_gcc_stdint=wrap
 	;;
 mep-*-*)
-	tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
+	tm_file="dbxelf.h elfos.h ${tm_file}"
 	tmake_file=mep/t-mep
 	extra_parts="crtbegin.o crtend.o"
 	c_target_objs="mep-pragma.o"