[llvm] r205070 - Windows: canonicalise the default windows triple

[NAKAMURA Takumi]

2014-03-29 10:08 GMT+09:00 Saleem Abdulrasool <compnerd at compnerd.org>:
> Author: compnerd
> Date: Fri Mar 28 20:08:53 2014
> New Revision: 205070
>
> URL: http://llvm.org/viewvc/llvm-project?rev=205070&view=rev
> Log:
> Windows: canonicalise the default windows triple
>
> Canonicalise the default triple that is used on Windows.  This should hopefully
> fix the MSVC buildbots.
>
> Modified:
>     llvm/trunk/lib/Support/Windows/Host.inc
>     llvm/trunk/tools/llvm-config/llvm-config.cpp
>
> Modified: llvm/trunk/lib/Support/Windows/Host.inc
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/Host.inc?rev=205070&r1=205069&r2=205070&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/Windows/Host.inc (original)
> +++ llvm/trunk/lib/Support/Windows/Host.inc Fri Mar 28 20:08:53 2014
> @@ -18,5 +18,5 @@
>  using namespace llvm;
>
>  std::string sys::getDefaultTargetTriple() {
> -  return LLVM_DEFAULT_TARGET_TRIPLE;
> +  return Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE);
>  }
>
> Modified: llvm/trunk/tools/llvm-config/llvm-config.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/llvm-config.cpp?rev=205070&r1=205069&r2=205070&view=diff
> ==============================================================================
> --- llvm/trunk/tools/llvm-config/llvm-config.cpp (original)
> +++ llvm/trunk/tools/llvm-config/llvm-config.cpp Fri Mar 28 20:08:53 2014
> @@ -20,6 +20,7 @@
>  #include "llvm/ADT/STLExtras.h"
>  #include "llvm/ADT/StringMap.h"
>  #include "llvm/ADT/StringRef.h"
> +#include "llvm/ADT/Triple.h"
>  #include "llvm/ADT/Twine.h"
>  #include "llvm/Config/config.h"
>  #include "llvm/Config/llvm-config.h"
> @@ -311,7 +312,7 @@ int main(int argc, char **argv) {
>        } else if (Arg == "--targets-built") {
>          OS << LLVM_TARGETS_BUILT << '\n';
>        } else if (Arg == "--host-target") {
> -        OS << LLVM_DEFAULT_TARGET_TRIPLE << '\n';
> +        OS << Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE) << '\n';

I think it's odd that --host-target doesn't show "well-known" form of
the triple.
I supposed it could be used in also 3rd party.

>        } else if (Arg == "--build-mode") {
>          OS << build_mode << '\n';
>        } else if (Arg == "--assertion-mode") {
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits