Module Name: src
Committed By: skrll
Date: Tue May 27 09:18:55 UTC 2014
Modified Files:
src/external/gpl3/gcc/dist: config.guess config.sub
src/external/gpl3/gcc/dist/gcc: ChangeLog Makefile.in builtins.c
config.gcc configure configure.ac dse.c expr.c gcc.c
src/external/gpl3/gcc/dist/gcc/config/arm: arm.h
src/external/gpl3/gcc/dist/gcc/config/i386: i386.c
src/external/gpl3/gcc/dist/gcc/config/rs6000: rs6000.c sysv4.h t-rs6000
src/external/gpl3/gcc/dist/gcc/config/sh: sh.c
src/external/gpl3/gcc/dist/gcc/config/sparc: sparc.md sync.md
src/external/gpl3/gcc/dist/gcc/doc: invoke.texi
src/external/gpl3/gcc/dist/libbacktrace: configure
src/external/gpl3/gcc/dist/libcpp: files.c lex.c macro.c
src/external/gpl3/gcc/dist/libgcc: config.host
src/external/gpl3/gcc/dist/libgomp: configure
src/external/gpl3/gcc/dist/libitm: configure
src/external/gpl3/gcc/dist/libmudflap: configure
src/external/gpl3/gcc/dist/libobjc: configure
src/external/gpl3/gcc/dist/libsanitizer: configure
src/external/gpl3/gcc/dist/libssp: configure
src/external/gpl3/gcc/dist/libstdc++-v3: configure
src/external/gpl3/gcc/dist/lto-plugin: configure
Added Files:
src/external/gpl3/gcc/dist: LAST_UPDATED MD5SUMS NEWS
src/external/gpl3/gcc/dist/INSTALL: binaries.html build.html
configure.html download.html finalinstall.html gfdl.html index.html
old.html prerequisites.html specific.html test.html
src/external/gpl3/gcc/dist/gcc: gengtype-lex.c
src/external/gpl3/gcc/dist/gcc/doc: aot-compile.1 cpp.1 cpp.info
cppinternals.info fsf-funding.7 g++.1 gc-analyze.1 gcc.1 gcc.info
gccinstall.info gccint.info gcj-dbtool.1 gcj.1 gcj.info gcov.1
gfdl.7 gfortran.1 gij.1 gpl.7 grmic.1 jcf-dump.1 jv-convert.1
rebuild-gcj-db.1
src/external/gpl3/gcc/dist/libgomp: libgomp.info
Log Message:
Resolve conflicts
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 src/external/gpl3/gcc/dist/LAST_UPDATED \
src/external/gpl3/gcc/dist/MD5SUMS src/external/gpl3/gcc/dist/NEWS
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/dist/config.guess
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/config.sub
cvs rdiff -u -r0 -r1.3 src/external/gpl3/gcc/dist/INSTALL/binaries.html \
src/external/gpl3/gcc/dist/INSTALL/build.html \
src/external/gpl3/gcc/dist/INSTALL/configure.html \
src/external/gpl3/gcc/dist/INSTALL/download.html \
src/external/gpl3/gcc/dist/INSTALL/finalinstall.html \
src/external/gpl3/gcc/dist/INSTALL/gfdl.html \
src/external/gpl3/gcc/dist/INSTALL/index.html \
src/external/gpl3/gcc/dist/INSTALL/old.html \
src/external/gpl3/gcc/dist/INSTALL/prerequisites.html \
src/external/gpl3/gcc/dist/INSTALL/specific.html \
src/external/gpl3/gcc/dist/INSTALL/test.html
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/dist/gcc/ChangeLog
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/dist/gcc/Makefile.in \
src/external/gpl3/gcc/dist/gcc/configure
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/dist/gcc/builtins.c
cvs rdiff -u -r1.23 -r1.24 src/external/gpl3/gcc/dist/gcc/config.gcc
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/dist/gcc/configure.ac
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/dse.c
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/expr.c
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/dist/gcc/gcc.c
cvs rdiff -u -r0 -r1.3 src/external/gpl3/gcc/dist/gcc/gengtype-lex.c
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/dist/gcc/config/arm/arm.h
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/dist/gcc/config/i386/i386.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/config/rs6000/sysv4.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/dist/gcc/config/rs6000/t-rs6000
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/config/sh/sh.c
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config/sparc/sparc.md
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md
cvs rdiff -u -r0 -r1.3 src/external/gpl3/gcc/dist/gcc/doc/aot-compile.1 \
src/external/gpl3/gcc/dist/gcc/doc/cpp.1 \
src/external/gpl3/gcc/dist/gcc/doc/cpp.info \
src/external/gpl3/gcc/dist/gcc/doc/cppinternals.info \
src/external/gpl3/gcc/dist/gcc/doc/fsf-funding.7 \
src/external/gpl3/gcc/dist/gcc/doc/g++.1 \
src/external/gpl3/gcc/dist/gcc/doc/gc-analyze.1 \
src/external/gpl3/gcc/dist/gcc/doc/gcc.1 \
src/external/gpl3/gcc/dist/gcc/doc/gcc.info \
src/external/gpl3/gcc/dist/gcc/doc/gccinstall.info \
src/external/gpl3/gcc/dist/gcc/doc/gccint.info \
src/external/gpl3/gcc/dist/gcc/doc/gcj-dbtool.1 \
src/external/gpl3/gcc/dist/gcc/doc/gcj.1 \
src/external/gpl3/gcc/dist/gcc/doc/gcj.info \
src/external/gpl3/gcc/dist/gcc/doc/gcov.1 \
src/external/gpl3/gcc/dist/gcc/doc/gfdl.7 \
src/external/gpl3/gcc/dist/gcc/doc/gfortran.1 \
src/external/gpl3/gcc/dist/gcc/doc/gij.1 \
src/external/gpl3/gcc/dist/gcc/doc/gpl.7 \
src/external/gpl3/gcc/dist/gcc/doc/grmic.1 \
src/external/gpl3/gcc/dist/gcc/doc/jcf-dump.1 \
src/external/gpl3/gcc/dist/gcc/doc/jv-convert.1 \
src/external/gpl3/gcc/dist/gcc/doc/rebuild-gcj-db.1
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/doc/invoke.texi
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/libbacktrace/configure
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/libcpp/files.c
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/libcpp/lex.c \
src/external/gpl3/gcc/dist/libcpp/macro.c
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/dist/libgcc/config.host
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/libgomp/configure
cvs rdiff -u -r0 -r1.3 src/external/gpl3/gcc/dist/libgomp/libgomp.info
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/libitm/configure
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/libmudflap/configure
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/libobjc/configure
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/libsanitizer/configure
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/libssp/configure
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/libstdc++-v3/configure
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/lto-plugin/configure
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
