Merging r196459:
------------------------------------------------------------------------
r196459 | rtrieu | 2013-12-04 18:52:09 -0800 (Wed, 04 Dec 2013) | 2 lines

Remove unused variable.

------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_34@196570 91177308-0d34-0410-b5e6-96231b3b80d8
Merging r196532:
------------------------------------------------------------------------
r196532 | joerg | 2013-12-05 13:07:29 -0800 (Thu, 05 Dec 2013) | 2 lines

Pass down the target CPU to the system assembler for NetBSD/ARM.

------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_34@196596 91177308-0d34-0410-b5e6-96231b3b80d8
Merging r196538:
------------------------------------------------------------------------
r196538 | joerg | 2013-12-05 13:27:58 -0800 (Thu, 05 Dec 2013) | 2 lines

For NetBSD, use arm1176jzf-s as default CPU for ARMv6.

------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_34@196597 91177308-0d34-0410-b5e6-96231b3b80d8