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
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
