Author: dsanders Date: Sun Jul 24 05:34:15 2016 New Revision: 276560 URL: http://llvm.org/viewvc/llvm-project?rev=276560&view=rev Log: 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 ------------------------------------------------------------------------ Modified: llvm/branches/release_39/include/llvm/ADT/Triple.h llvm/branches/release_39/lib/Support/Triple.cpp Modified: llvm/branches/release_39/include/llvm/ADT/Triple.h URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_39/include/llvm/ADT/Triple.h?rev=276560&r1=276559&r2=276560&view=diff ============================================================================== --- llvm/branches/release_39/include/llvm/ADT/Triple.h (original) +++ llvm/branches/release_39/include/llvm/ADT/Triple.h Sun Jul 24 05:34:15 2016 @@ -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. Modified: llvm/branches/release_39/lib/Support/Triple.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_39/lib/Support/Triple.cpp?rev=276560&r1=276559&r2=276560&view=diff ============================================================================== --- llvm/branches/release_39/lib/Support/Triple.cpp (original) +++ llvm/branches/release_39/lib/Support/Triple.cpp Sun Jul 24 05:34:15 2016 @@ -201,6 +201,7 @@ const char *Triple::getEnvironmentTypeNa 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 parseEnvi 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) _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
