Module Name: src
Committed By: plunky
Date: Thu Jul 24 20:12:50 UTC 2014
Modified Files:
src/external/bsd/pcc/dist/pcc: configure.ac
src/external/bsd/pcc/dist/pcc/arch/amd64: local.c local2.c
src/external/bsd/pcc/dist/pcc/cc/cc: cc.1
src/external/bsd/pcc/dist/pcc/cc/ccom: ccom.1 gcc_compat.c main.c
pass1.h pftn.c scan.l trees.c
src/external/bsd/pcc/dist/pcc/cc/cpp: cpp.1 cpp.c
src/external/bsd/pcc/dist/pcc/mip: common.c optim2.c
Log Message:
fix merge conflicts for pcc-20140706
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pcc/dist/pcc/configure.ac
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pcc/dist/pcc/arch/amd64/local.c \
src/external/bsd/pcc/dist/pcc/arch/amd64/local2.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pcc/dist/pcc/cc/cc/cc.1
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pcc/dist/pcc/cc/ccom/ccom.1
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pcc/dist/pcc/cc/ccom/gcc_compat.c \
src/external/bsd/pcc/dist/pcc/cc/ccom/scan.l
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pcc/dist/pcc/cc/ccom/main.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pcc/dist/pcc/cc/ccom/pass1.h \
src/external/bsd/pcc/dist/pcc/cc/ccom/trees.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/pcc/dist/pcc/cc/ccom/pftn.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pcc/dist/pcc/cc/cpp/cpp.1
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pcc/dist/pcc/cc/cpp/cpp.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pcc/dist/pcc/mip/common.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pcc/dist/pcc/mip/optim2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
