Commit 53da0ecd authored by Daniel Sanders's avatar Daniel Sanders
Browse files

Merging r275966: 

------------------------------------------------------------------------
r275966 | dsanders | 2016-07-19 11:22:19 +0100 (Tue, 19 Jul 2016) | 11 lines

[mips] Recognise the triple used by Debian stretch for mips64el.

Summary:
The triple used for this distribution is mips64el-linux-gnuabi64.

Reviewers: sdardis

Subscribers: sdardis, llvm-commits

Differential Revision: https://reviews.llvm.org/D22406

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

llvm-svn: 276560
parent f5408dc3

llvm/include/llvm/ADT/Triple.h

+4 −2
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ public: 
    UnknownEnvironment,



    GNU,

    GNUABI64,

    GNUEABI,

    GNUEABIHF,

    GNUX32,
@@ -476,8 +477,9 @@ public: 


  bool isGNUEnvironment() const {

    EnvironmentType Env = getEnvironment();

    return Env == Triple::GNU || Env == Triple::GNUEABI ||

           Env == Triple::GNUEABIHF || Env == Triple::GNUX32;

    return Env == Triple::GNU || Env == Triple::GNUABI64 ||

           Env == Triple::GNUEABI || Env == Triple::GNUEABIHF ||

           Env == Triple::GNUX32;

  }



  /// Checks if the environment could be MSVC.

llvm/lib/Support/Triple.cpp

+2 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ const char *Triple::getEnvironmentTypeName(EnvironmentType Kind) { 
  switch (Kind) {

  case UnknownEnvironment: return "unknown";

  case GNU: return "gnu";

  case GNUABI64: return "gnuabi64";

  case GNUEABIHF: return "gnueabihf";

  case GNUEABI: return "gnueabi";

  case GNUX32: return "gnux32";
@@ -468,6 +469,7 @@ static Triple::EnvironmentType parseEnvironment(StringRef EnvironmentName) { 
  return StringSwitch<Triple::EnvironmentType>(EnvironmentName)

    .StartsWith("eabihf", Triple::EABIHF)

    .StartsWith("eabi", Triple::EABI)

    .StartsWith("gnuabi64", Triple::GNUABI64)

    .StartsWith("gnueabihf", Triple::GNUEABIHF)

    .StartsWith("gnueabi", Triple::GNUEABI)

    .StartsWith("gnux32", Triple::GNUX32)