Commit e119784d authored by Hans Wennborg's avatar Hans Wennborg
Browse files

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.

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

llvm-svn: 227396
parent 6c3d6a0b

clang/lib/Driver/Tools.cpp

+2 −0
Original line number Diff line number Diff line
@@ -6886,6 +6886,8 @@ void netbsd::Link::ConstructJob(Compilation &C, const JobAction &JA, 
    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:

clang/test/Driver/netbsd.c

+7 −1
Original line number Diff line number Diff line
@@ -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"