[Midnightbsd-cvs] src: cc/cc_tools: Resolve merge conflicts.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Resolve merge conflicts.

Modified Files:
--------------
    src/gnu/usr.bin/cc/cc_tools:
        Makefile (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/cc/cc_tools/Makefile?r1=1.6&r2=1.7)
        auto-host.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/cc/cc_tools/auto-host.h?r1=1.3&r2=1.4)
        freebsd-native.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/cc/cc_tools/freebsd-native.h?r1=1.3&r2=1.4)

Added Files:
-----------
    src/gnu/usr.bin/cc/cc_tools:
        arm.md.diff (r1.3)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/cc/cc_tools/arm.md.diff?rev=1.3&content-type=text/x-cvsweb-markup)

Removed Files:
-------------
    src/gnu/usr.bin/cc/cc_tools:
        freebsd64-fix.h
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h)