From owner-cvs-all@FreeBSD.ORG  Sat Aug 26 21:37:21 2006
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 D15E016A4DD;
	Sat, 26 Aug 2006 21:37:21 +0000 (UTC) (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 94E87446B2;
	Sat, 26 Aug 2006 21:37:21 +0000 (GMT) (envelope-from kan@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7QLbLR4024547;
	Sat, 26 Aug 2006 21:37:21 GMT (envelope-from kan@repoman.freebsd.org)
Received: (from kan@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7QLbLcq024546;
	Sat, 26 Aug 2006 21:37:21 GMT (envelope-from kan)
Message-Id: <200608262137.k7QLbLcq024546@repoman.freebsd.org>
From: Alexander Kabaev <kan@FreeBSD.org>
Date: Sat, 26 Aug 2006 21:37: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 builtins.c c-common.c c-common.h
 c-decl.c configure cppinit.c gcc.c toplev.c version.c
 src/contrib/gcc/config x-linux src/contrib/gcc/config/alpha
 alpha.c src/contrib/gcc/config/i386 i386.c i386.md ...
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: Sat, 26 Aug 2006 21:37:21 -0000

kan         2006-08-26 21:37:21 UTC

  FreeBSD src repository

  Modified files:
    contrib/gcc          builtins.c c-common.c c-common.h c-decl.c 
                         configure cppinit.c gcc.c toplev.c 
                         version.c 
    contrib/gcc/config/alpha alpha.c 
    contrib/gcc/config/i386 i386.c i386.md 
    contrib/gcc/cp       decl.c 
    contrib/gcc/f        g77spec.c 
  Added files:
    contrib/gcc/config   x-linux 
  Log:
  Resolve conflicts after GCC 3.4.6 20060825 import.
  
  Revision  Changes    Path
  1.10      +23 -14    src/contrib/gcc/builtins.c
  1.21      +12 -0     src/contrib/gcc/c-common.c
  1.8       +2 -0      src/contrib/gcc/c-common.h
  1.14      +46 -33    src/contrib/gcc/c-decl.c
  1.11      +22 -1     src/contrib/gcc/config/alpha/alpha.c
  1.23      +3 -2      src/contrib/gcc/config/i386/i386.c
  1.19      +8 -8      src/contrib/gcc/config/i386/i386.md
  1.3       +4 -0      src/contrib/gcc/config/x-linux (new)
  1.22      +39 -0     src/contrib/gcc/configure
  1.20      +87 -67    src/contrib/gcc/cp/decl.c
  1.9       +6 -2      src/contrib/gcc/cppinit.c
  1.5       +3 -3      src/contrib/gcc/f/g77spec.c
  1.41      +4 -2      src/contrib/gcc/gcc.c
  1.26      +6 -2      src/contrib/gcc/toplev.c
  1.13      +2 -2      src/contrib/gcc/version.c