Commit dabd1af0 authored by Brad Smith's avatar Brad Smith
Browse files

Merging r296430: 

------------------------------------------------------------------------
r296430 | brad | 2017-02-27 22:20:26 -0500 (Mon, 27 Feb 2017) | 2 lines

Set ABIs correctly for OpenBSD/arm; soft float and aapcs-linux.
------------------------------------------------------------------------

llvm-svn: 301086
parent 1e8b1a88

clang/lib/Basic/Targets.cpp

+2 −0
Original line number Diff line number Diff line
@@ -5146,6 +5146,8 @@ public: 
      default:

        if (Triple.getOS() == llvm::Triple::NetBSD)

          setABI("apcs-gnu");

        else if (Triple.getOS() == llvm::Triple::OpenBSD)

          setABI("aapcs-linux");

        else

          setABI("aapcs");

        break;

clang/lib/Driver/Tools.cpp

+6 −0
Original line number Diff line number Diff line
@@ -962,6 +962,10 @@ arm::FloatABI arm::getARMFloatABI(const ToolChain &TC, const ArgList &Args) { 
      }

      break;



    case llvm::Triple::OpenBSD:

      ABI = FloatABI::Soft;

      break;



    default:

      switch (Triple.getEnvironment()) {

      case llvm::Triple::GNUEABIHF:
@@ -1251,6 +1255,8 @@ void Clang::AddARMTargetArgs(const llvm::Triple &Triple, const ArgList &Args, 
    default:

      if (Triple.getOS() == llvm::Triple::NetBSD)

        ABIName = "apcs-gnu";

      else if (Triple.getOS() == llvm::Triple::OpenBSD)

        ABIName = "aapcs-linux";

      else

        ABIName = "aapcs";

      break;

clang/test/Driver/arm-abi.c

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ 
// RUN: %clang -target arm--netbsd-eabihf %s -### -o %t.o 2>&1 \

// RUN:   | FileCheck -check-prefix=CHECK-AAPCS %s



// OpenBSD defaults to aapcs-linux

// RUN: %clang -target arm--openbsd- %s -### -o %t.o 2>&1 \

// RUN:   | FileCheck -check-prefix=CHECK-AAPCS-LINUX %s



// Otherwise, ABI is selected based on environment

// RUN: %clang -target arm---android %s -### -o %t.o 2>&1 \

// RUN:   | FileCheck -check-prefix=CHECK-AAPCS-LINUX %s

clang/test/Driver/openbsd.c

+5 −0
Original line number Diff line number Diff line
@@ -96,3 +96,8 @@ 
// CHECK-STATIC-PIE: "{{.*}}rcrt0.o"

// CHECK-STATIC-PIE-NOT: "-nopie"

// CHECK-NOPIE: "-nopie" "{{.*}}crt0.o"



// Check ARM float ABI

// RUN: %clang -target arm-unknown-openbsd -### -c %s 2>&1 \

// RUN:   | FileCheck -check-prefix=CHECK-ARM-FLOAT-ABI %s

// CHECK-ARM-FLOAT-ABI: "-mfloat-abi" "soft"