[llvm-branch-commits] [cfe-branch] r227396 - Merging r227088:

[Hans Wennborg]

Author: hans
Date: Wed Jan 28 17:49:42 2015
New Revision: 227396

URL: http://llvm.org/viewvc/llvm-project?rev=227396&view=rev
Log:
Merging r227088:
------------------------------------------------------------------------
r227088 | joerg | 2015-01-26 04:30:16 -0800 (Mon, 26 Jan 2015) | 3 lines

For NetBSD/ARM-EB, link with --be8. Support for the older BE32 is
currently not planned.

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

Modified:
    cfe/branches/release_36/   (props changed)
    cfe/branches/release_36/lib/Driver/Tools.cpp
    cfe/branches/release_36/test/Driver/netbsd.c

Propchange: cfe/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 28 17:49:42 2015
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:226008,226049,226136,226282,226624,226707,226754,226863,226877,227062,227220,227251,227278,227295,227368
+/cfe/trunk:226008,226049,226136,226282,226624,226707,226754,226863,226877,227062,227088,227220,227251,227278,227295,227368
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_36/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_36/lib/Driver/Tools.cpp?rev=227396&r1=227395&r2=227396&view=diff
==============================================================================
--- cfe/branches/release_36/lib/Driver/Tools.cpp (original)
+++ cfe/branches/release_36/lib/Driver/Tools.cpp Wed Jan 28 17:49:42 2015
@@ -6886,6 +6886,8 @@ void netbsd::Link::ConstructJob(Compilat
     break;
   case llvm::Triple::armeb:
   case llvm::Triple::thumbeb:
+    if (!Args.hasArg(options::OPT_r))
+      CmdArgs.push_back("--be8");
     CmdArgs.push_back("-m");
     switch (getToolChain().getTriple().getEnvironment()) {
     case llvm::Triple::EABI:

Modified: cfe/branches/release_36/test/Driver/netbsd.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_36/test/Driver/netbsd.c?rev=227396&r1=227395&r2=227396&view=diff
==============================================================================
--- cfe/branches/release_36/test/Driver/netbsd.c (original)
+++ cfe/branches/release_36/test/Driver/netbsd.c Wed Jan 28 17:49:42 2015
@@ -19,6 +19,9 @@
 // RUN: %clang -no-canonical-prefixes -target armeb--netbsd-eabi \
 // RUN: -no-integrated-as --sysroot=%S/Inputs/basic_netbsd_tree %s -### 2>&1 \
 // RUN: | FileCheck -check-prefix=ARMEB %s
+// RUN: %clang -r -no-canonical-prefixes -target armeb--netbsd-eabi \
+// RUN: -no-integrated-as --sysroot=%S/Inputs/basic_netbsd_tree %s -### 2>&1 \
+// RUN: | FileCheck -check-prefix=ARMEB-R %s
 // RUN: %clang -no-canonical-prefixes -target arm--netbsd \
 // RUN: -no-integrated-as --sysroot=%S/Inputs/basic_netbsd_tree %s -### 2>&1 \
 // RUN: | FileCheck -check-prefix=ARM-APCS %s
@@ -132,12 +135,15 @@
 // ARMEB: clang{{.*}}" "-cc1" "-triple" "armebv5e--netbsd-eabi"
 // ARMEB: as{{.*}}" "-mcpu=arm926ej-s" "-o"
 // ARMEB: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-// ARMEB: "-m" "armelfb_nbsd_eabi"
+// ARMEB: "--be8" "-m" "armelfb_nbsd_eabi"
 // ARMEB: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
 // ARMEB: "{{.*}}/usr/lib{{/|\\\\}}eabi{{/|\\\\}}crti.o"
 // ARMEB: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
 // ARMEB: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
 
+// ARMEB-R: ld{{.*}}"
+// ARMEB-R-NOT: "--be8"
+
 // ARM-APCS: clang{{.*}}" "-cc1" "-triple" "armv4--netbsd"
 // ARM-APCS: as{{.*}}" "-mcpu=strongarm" "-o"
 // ARM-APCS: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"