From owner-cvs-all@FreeBSD.ORG  Fri Jun  3 04:02:21 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 661FF16A41C;
	Fri,  3 Jun 2005 04:02:21 +0000 (GMT) (envelope-from kan@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4005643D4C;
	Fri,  3 Jun 2005 04:02:21 +0000 (GMT) (envelope-from kan@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5342L40011633;
	Fri, 3 Jun 2005 04:02:21 GMT (envelope-from kan@repoman.freebsd.org)
Received: (from kan@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5342LF1011632;
	Fri, 3 Jun 2005 04:02:21 GMT (envelope-from kan)
Message-Id: <200506030402.j5342LF1011632@repoman.freebsd.org>
From: Alexander Kabaev <kan@FreeBSD.org>
Date: Fri, 3 Jun 2005 04:02:21 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/contrib/gcc c-common.c c-format.c c-opts.c c.opt
 function.c gcc.c toplev.c src/contrib/gcc/config freebsd-spec.h
 src/contrib/gcc/config/i386 freebsd.h i386.c i386.h
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jun 2005 04:02:21 -0000

kan         2005-06-03 04:02:21 UTC

  FreeBSD src repository

  Modified files:
    contrib/gcc          c-common.c c-format.c c-opts.c c.opt 
                         function.c gcc.c toplev.c 
    contrib/gcc/config   freebsd-spec.h 
    contrib/gcc/config/i386 freebsd.h i386.c i386.h 
  Log:
  Merge conflicts for GCC 3.4.4.
  
  Revision  Changes    Path
  1.20      +43 -51    src/contrib/gcc/c-common.c
  1.10      +76 -6     src/contrib/gcc/c-format.c
  1.3       +27 -13    src/contrib/gcc/c-opts.c
  1.3       +5 -5      src/contrib/gcc/c.opt
  1.19      +17 -17    src/contrib/gcc/config/freebsd-spec.h
  1.70      +3 -10     src/contrib/gcc/config/i386/freebsd.h
  1.22      +97 -37    src/contrib/gcc/config/i386/i386.c
  1.20      +8 -6      src/contrib/gcc/config/i386/i386.h
  1.22      +51 -32    src/contrib/gcc/function.c
  1.40      +14 -6     src/contrib/gcc/gcc.c
  1.25      +10 -5     src/contrib/gcc/toplev.c