Skip to content

Commit ac40e2c

Browse files
arjunr2arjunr2
committed
Change target name to wasm32-linux-muslwali 
1 parent 58a1bc7 commit ac40e2c

File tree

6 files changed

+31
-45
lines changed

6 files changed

+31
-45
lines changed

‎clang/lib/Basic/Targets.cpp‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,7 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
453453
return std::make_unique<FuchsiaTargetInfo<RISCV64TargetInfo>>(Triple,
454454
Opts);
455455
case llvm::Triple::Haiku:
456-
return std::make_unique<HaikuTargetInfo<RISCV64TargetInfo>>(Triple,
457-
Opts);
456+
return std::make_unique<HaikuTargetInfo<RISCV64TargetInfo>>(Triple, Opts);
458457
case llvm::Triple::Linux:
459458
switch (Triple.getEnvironment()) {
460459
default:
@@ -694,44 +693,43 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
694693
}
695694
case llvm::Triple::wasm32:
696695
if (Triple.getSubArch() != llvm::Triple::NoSubArch ||
697-
(!Triple.isWALI() &&
698-
Triple.getVendor() != llvm::Triple::UnknownVendor) ||
696+
Triple.getVendor() != llvm::Triple::UnknownVendor ||
699697
!Triple.isOSBinFormatWasm())
700698
return nullptr;
701699
switch (os) {
702-
case llvm::Triple::WASI:
700+
case llvm::Triple::WASI:
703701
return std::make_unique<WASITargetInfo<WebAssembly32TargetInfo>>(Triple,
704702
Opts);
705-
case llvm::Triple::Emscripten:
703+
case llvm::Triple::Emscripten:
706704
return std::make_unique<EmscriptenTargetInfo<WebAssembly32TargetInfo>>(
707705
Triple, Opts);
708-
// WALI OS target
709-
case llvm::Triple::Linux:
710-
return std::make_unique<WALITargetInfo<WebAssembly32TargetInfo>>(Triple,
711-
Opts);
712-
case llvm::Triple::UnknownOS:
706+
707+
case llvm::Triple::Linux:
708+
return std::make_unique<WALITargetInfo<WebAssembly32TargetInfo>>(Triple,
709+
Opts);
710+
case llvm::Triple::UnknownOS:
713711
return std::make_unique<WebAssemblyOSTargetInfo<WebAssembly32TargetInfo>>(
714712
Triple, Opts);
715-
default:
716-
return nullptr;
713+
default:
714+
return nullptr;
717715
}
718716
case llvm::Triple::wasm64:
719717
if (Triple.getSubArch() != llvm::Triple::NoSubArch ||
720718
Triple.getVendor() != llvm::Triple::UnknownVendor ||
721719
!Triple.isOSBinFormatWasm())
722720
return nullptr;
723721
switch (os) {
724-
case llvm::Triple::WASI:
722+
case llvm::Triple::WASI:
725723
return std::make_unique<WASITargetInfo<WebAssembly64TargetInfo>>(Triple,
726724
Opts);
727-
case llvm::Triple::Emscripten:
725+
case llvm::Triple::Emscripten:
728726
return std::make_unique<EmscriptenTargetInfo<WebAssembly64TargetInfo>>(
729727
Triple, Opts);
730-
case llvm::Triple::UnknownOS:
728+
case llvm::Triple::UnknownOS:
731729
return std::make_unique<WebAssemblyOSTargetInfo<WebAssembly64TargetInfo>>(
732730
Triple, Opts);
733-
default:
734-
return nullptr;
731+
default:
732+
return nullptr;
735733
}
736734

737735
case llvm::Triple::dxil:
@@ -811,8 +809,7 @@ TargetInfo *TargetInfo::CreateTargetInfo(DiagnosticsEngine &Diags,
811809
}
812810

813811
// Check the TuneCPU name if specified.
814-
if (!Opts->TuneCPU.empty() &&
815-
!Target->isValidTuneCPUName(Opts->TuneCPU)) {
812+
if (!Opts->TuneCPU.empty() && !Target->isValidTuneCPUName(Opts->TuneCPU)) {
816813
Diags.Report(diag::err_target_unknown_cpu) << Opts->TuneCPU;
817814
SmallVector<StringRef, 32> ValidList;
818815
Target->fillValidTuneCPUList(ValidList);

‎clang/test/Driver/unsupported-target-arch.c‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,3 @@
7777
// RUN: not %clang_cl --target=x86-unknown-uefi -o %t.o %s 2> %t.err
7878
// RUN: FileCheck --input-file=%t.err -check-prefixes=CHECK-x86 %s
7979
// CHECK-x86: error: unknown target triple 'x86-unknown-uefi'{{$}}
80-
81-
// Linux API for wasm must include `wali` vendor and `linux` OS
82-
//
83-
// RUN: not %clang -### --target=wasm32-linux-musl -o %t.o %s 2> %t.err \
84-
// RUN: FileCheck --input-file=%t.err -check-prefixes=CHECK-WASM-WALI-NO-VENDOR %s
85-
// CHECK-WASM-WALI-NO-VENDOR: error: unknown target triple 'wasm32-unknown-linux-musl'
86-
//
87-
// RUN: not %clang -### --target=wasm32-wali-wasi-musl -o %t.o %s 2> %t.err \
88-
// RUN: FileCheck --input-file=%t.err -check-prefixes=CHECK-WASM-WALI-NO-LINUX %s
89-
// CHECK-WASM-WALI-NO-LINUX: error: unknown target triple 'wasm32-wali-wasi-musl'

‎clang/test/Driver/wasm-toolchain.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,9 @@
297297
// LINK_WASIP2_USE_WASMLD: "-cc1" {{.*}} "-o" "[[temp:[^"]*]]"
298298
// LINK_WASIP2_USE_WASMLD: wasm-ld{{.*}}" "-m" "wasm32" {{.*}} "[[temp]]" {{.*}}
299299

300-
// Basic `wasm32-wali-linux-musl` compile-link test.
300+
// Basic `wasm32-linux-muslwali` compile-link test.
301301

302-
// RUN: %clang -### --target=wasm32-wali-linux-musl --sysroot=/foo %s 2>&1 \
302+
// RUN: %clang -### --target=wasm32-linux-muslwali --sysroot=/foo %s 2>&1 \
303303
// RUN: | FileCheck -check-prefix=LINK_WALI_BASIC %s
304304
// LINK_WALI_BASIC: "-cc1" {{.*}} "-o" "[[temp:[^"]*]]"
305-
// LINK_WALI_BASIC: wasm-ld{{.*}}" "-L/foo/lib/wasm32-linux-musl" "crt1.o" "[[temp]]" "-lc" "{{.*[/\\]}}libclang_rt.builtins.a" "-o" "a.out"
305+
// LINK_WALI_BASIC: wasm-ld{{.*}}" "-L/foo/lib/wasm32-linux-muslwali" "crt1.o" "[[temp]]" "-lc" "{{.*[/\\]}}libclang_rt.builtins.a" "-o" "a.out"

‎clang/test/Driver/wasm-toolchain.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,27 +87,27 @@
8787
// COMPILE_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/wasm32-wasi"
8888
// COMPILE_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include"
8989

90-
// RUN: %clangxx -### --target=wasm32-wali-linux-musl --stdlib=libc++ %s 2>&1 \
90+
// RUN: %clangxx -### --target=wasm32-linux-muslwali --stdlib=libc++ %s 2>&1 \
9191
// RUN: --sysroot=%S/Inputs/basic_linux_libcxx_tree/usr \
9292
// RUN: | FileCheck -check-prefix=COMPILE_WALI %s
9393
// COMPILE_WALI: "-cc1"
9494
// COMPILE_WALI: "-resource-dir" "[[RESOURCE_DIR:[^"]*]]"
9595
// COMPILE_WALI: "-isysroot" "[[SYSROOT:[^"]+]]"
96-
// COMPILE_WALI: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/wasm32-linux-musl/c++/v1"
96+
// COMPILE_WALI: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/wasm32-linux-muslwali/c++/v1"
9797
// COMPILE_WALI: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/c++/v1"
9898
// COMPILE_WALI: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
99-
// COMPILE_WALI: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/wasm32-linux-musl"
99+
// COMPILE_WALI: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/wasm32-linux-muslwali"
100100
// COMPILE_WALI: "-internal-isystem" "[[SYSROOT:[^"]+]]/include"
101101

102-
// RUN: %clangxx -### --target=wasm32-wali-linux-musl --stdlib=libstdc++ %s 2>&1 \
102+
// RUN: %clangxx -### --target=wasm32-linux-muslwali --stdlib=libstdc++ %s 2>&1 \
103103
// RUN: --sysroot=%S/Inputs/basic_linux_libstdcxx_libcxxv2_tree/usr \
104104
// RUN: | FileCheck -check-prefix=COMPILE_WALI_STDCXX %s
105105
// COMPILE_WALI_STDCXX: "-cc1"
106106
// COMPILE_WALI_STDCXX: "-resource-dir" "[[RESOURCE_DIR:[^"]*]]"
107107
// COMPILE_WALI_STDCXX: "-isysroot" "[[SYSROOT:[^"]+]]"
108-
// COMPILE_WALI_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/c++/4.8/wasm32-linux-musl"
108+
// COMPILE_WALI_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/c++/4.8/wasm32-linux-muslwali"
109109
// COMPILE_WALI_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/c++/4.8"
110110
// COMPILE_WALI_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/c++/4.8/backward"
111111
// COMPILE_WALI_STDCXX: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
112-
// COMPILE_WALI_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/wasm32-linux-musl"
112+
// COMPILE_WALI_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/wasm32-linux-muslwali"
113113
// COMPILE_WALI_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include"

‎llvm/include/llvm/TargetParser/Triple.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ class Triple {
200200
SUSE,
201201
OpenEmbedded,
202202
Intel,
203-
WALI,
204203
Meta,
205204
LastVendorType = Meta
206205
};
@@ -278,6 +277,7 @@ class Triple {
278277
MuslF32,
279278
MuslSF,
280279
MuslX32,
280+
MuslWALI,
281281
LLVM,
282282

283283
MSVC,
@@ -801,8 +801,8 @@ class Triple {
801801

802802
/// Tests whether the target uses WALI Wasm
803803
bool isWALI() const {
804-
return getArch() == Triple::wasm32 && getVendor() == Triple::WALI &&
805-
getOS() == Triple::Linux;
804+
return getArch() == Triple::wasm32 &&
805+
isOSLinux() && getEnvironment() == Triple::MuslWALI;
806806
}
807807

808808
/// Tests whether the target is the PS4 platform.
@@ -847,6 +847,7 @@ class Triple {
847847
getEnvironment() == Triple::MuslF32 ||
848848
getEnvironment() == Triple::MuslSF ||
849849
getEnvironment() == Triple::MuslX32 ||
850+
getEnvironment() == Triple::MuslWALI ||
850851
getEnvironment() == Triple::OpenHOS || isOSLiteOS();
851852
}
852853

‎llvm/lib/TargetParser/Triple.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,6 @@ StringRef Triple::getVendorTypeName(VendorType Kind) {
279279
case PC: return "pc";
280280
case SCEI: return "scei";
281281
case SUSE: return "suse";
282-
case WALI:
283-
return "wali";
284282
case Meta:
285283
return "meta";
286284
}
@@ -691,7 +689,6 @@ static Triple::VendorType parseVendor(StringRef VendorName) {
691689
.Case("suse", Triple::SUSE)
692690
.Case("oe", Triple::OpenEmbedded)
693691
.Case("intel", Triple::Intel)
694-
.Case("wali", Triple::WALI)
695692
.Case("meta", Triple::Meta)
696693
.Default(Triple::UnknownVendor);
697694
}
@@ -770,6 +767,7 @@ static Triple::EnvironmentType parseEnvironment(StringRef EnvironmentName) {
770767
.StartsWith("muslf32", Triple::MuslF32)
771768
.StartsWith("muslsf", Triple::MuslSF)
772769
.StartsWith("muslx32", Triple::MuslX32)
770+
.StartsWith("muslwali", Triple::MuslWALI)
773771
.StartsWith("musl", Triple::Musl)
774772
.StartsWith("msvc", Triple::MSVC)
775773
.StartsWith("itanium", Triple::Itanium)

0 commit comments

Comments
 (0)