From patchwork Fri Dec 17 21:16:56 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Diego Novillo <dnovillo@google.com>
X-Patchwork-Id: 75984
Return-Path: 
 <gcc-patches-return-281333-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 0453CB7063
	for <incoming@patchwork.ozlabs.org>;
	Sat, 18 Dec 2010 08:17:08 +1100 (EST)
Received: (qmail 30188 invoked by alias); 17 Dec 2010 21:17:06 -0000
Received: (qmail 30179 invoked by uid 22791); 17 Dec 2010 21:17:06 -0000
X-SWARE-Spam-Status: No, hits=-2.7 required=5.0	tests=AWL, BAYES_00,
	DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, SPF_HELO_PASS,
	T_RP_MATCHES_RCVD
X-Spam-Check-By: sourceware.org
Received: from smtp-out.google.com (HELO smtp-out.google.com)
	(74.125.121.67) by sourceware.org (qpsmtpd/0.43rc1) with
	ESMTP; Fri, 17 Dec 2010 21:17:01 +0000
Received: from kpbe12.cbf.corp.google.com (kpbe12.cbf.corp.google.com
	[172.25.105.76])	by smtp-out.google.com with ESMTP id
	oBHLGwJm014761	for <gcc-patches@gcc.gnu.org>;
	Fri, 17 Dec 2010 13:16:58 -0800
Received: from topo.tor.corp.google.com (topo.tor.corp.google.com
	[172.29.41.2])	by kpbe12.cbf.corp.google.com with ESMTP id
	oBHLGuHP003494; Fri, 17 Dec 2010 13:16:57 -0800
Received: by topo.tor.corp.google.com (Postfix, from userid 54752)	id
	32BFC1DA1CA; Fri, 17 Dec 2010 16:16:56 -0500 (EST)
Date: Fri, 17 Dec 2010 16:16:56 -0500
From: Diego Novillo <dnovillo@google.com>
To: gcc-patches@gcc.gnu.org, Lawrence Crowl <crowl@google.com>
Subject: [pph] Fix broken bootstrap
Message-ID: <20101217211654.GA10915@google.com>
MIME-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.5.20 (2009-06-14)
X-System-Of-Record: true
X-IsSubscribed: yes
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

I didn't test my merge properly earlier today.  I put the trunk
revision information in BASE-VER, which added a space to the
string.  This confused the pre-processor symbols where that
string is baked in.

Fixed with this.  Lawrence, apologies for the breakage!

Tested on x86_64.  Committed to the branch.


Diego.

2010-12-17  Diego Novillo  <dnovillo@google.com>

	Fix broken bootstrap.

	* BASE-VER: Move trunk revision suffix...
	* DATESTAMP: ... here.

Index: DATESTAMP
===================================================================
--- DATESTAMP	(revision 167996)
+++ DATESTAMP	(working copy)
@@ -1 +1 @@
-20101216
+20101216 (trunk r167963)
Index: BASE-VER
===================================================================
--- BASE-VER	(revision 167996)
+++ BASE-VER	(working copy)
@@ -1 +1 @@
-4.6.0-pph (trunk r167963)
+4.6.0-pph