Module Name: src
Committed By: skrll
Date: Tue Sep 18 07:04:42 UTC 2012
Modified Files:
src/external/gpl3/gcc/dist: configure configure.ac
src/external/gpl3/gcc/dist/gcc: ChangeLog builtins.c cfgexpand.c
config.gcc configure expr.c
src/external/gpl3/gcc/dist/gcc/config/arm: arm.md bpabi.h
src/external/gpl3/gcc/dist/gcc/config/i386: i386.c
src/external/gpl3/gcc/dist/gcc/config/rs6000: rs6000.c
src/external/gpl3/gcc/dist/gcc/config/sh: sh.c
Removed Files:
src/external/gpl3/gcc/dist/gcc/testsuite/gcc.c-torture/execute:
960321-1.x
Log Message:
Resolve conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/configure \
src/external/gpl3/gcc/dist/configure.ac
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/ChangeLog
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/builtins.c \
src/external/gpl3/gcc/dist/gcc/cfgexpand.c \
src/external/gpl3/gcc/dist/gcc/expr.c
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/dist/gcc/config.gcc
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/configure
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config/arm/arm.md
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/config/arm/bpabi.h
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config/i386/i386.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config/sh/sh.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl3/gcc/dist/gcc/testsuite/gcc.c-torture/execute/960321-1.x
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
