# Conflicts: # binutils/bfd/config.bfd # binutils/ld/configure.tgt # gcc/gcc/c-family/c-common.c # gcc/gcc/c/c-parser.c # gcc/gcc/calls.c # gcc/gcc/config/m68k/m68k.c # gcc/gcc/config/rs6000/rs6000.c # gcc/gcc/config/rs6000/rs6000.opt # hfsutils/COPYING # hfsutils/install-sh