diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2024-09-19 22:47:00 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2024-09-19 22:47:56 -0700 |
| commit | c6ad4521c77372cb52adfb9a52b0854d830fed9c (patch) | |
| tree | 82ea66f7c40db3423e344bcbbf9295e8ee10fea6 /src/zig_llvm.cpp | |
| parent | 8b82a0e0fc5cac9a5376f06955ca4419b9a9923f (diff) | |
| parent | 075ec5555264b759035e7d607faf03704075af23 (diff) | |
| download | zig-c6ad4521c77372cb52adfb9a52b0854d830fed9c.tar.gz zig-c6ad4521c77372cb52adfb9a52b0854d830fed9c.zip | |
Merge branch 'llvm19'
Upgrades the LLVM, Clang, and LLD dependencies to LLVM 19.x
Related to #16270
Big thanks to Alex Rønne Petersen for doing the bulk of the upgrade work
in this branch.
Diffstat (limited to 'src/zig_llvm.cpp')
| -rw-r--r-- | src/zig_llvm.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp index 351b28df6b..d2f68a6d49 100644 --- a/src/zig_llvm.cpp +++ b/src/zig_llvm.cpp @@ -478,7 +478,7 @@ bool ZigLLVMWriteImportLibrary(const char *def_path, const ZigLLVM_ArchType arch return true; } - // The exports-juggling code below is ripped from LLVM's DllToolDriver.cpp + // The exports-juggling code below is ripped from LLVM's DlltoolDriver.cpp // If ExtName is set (if the "ExtName = Name" syntax was used), overwrite // Name with ExtName and clear ExtName. When only creating an import @@ -494,7 +494,7 @@ bool ZigLLVMWriteImportLibrary(const char *def_path, const ZigLLVM_ArchType arch if (machine == COFF::IMAGE_FILE_MACHINE_I386 && kill_at) { for (object::COFFShortExport& E : def->Exports) { - if (!E.AliasTarget.empty() || (!E.Name.empty() && E.Name[0] == '?')) + if (!E.ImportName.empty() || (!E.Name.empty() && E.Name[0] == '?')) continue; E.SymbolName = E.Name; // Trim off the trailing decoration. Symbols will always have a @@ -692,6 +692,7 @@ static_assert((Triple::OSType)ZigLLVM_PS4 == Triple::PS4, ""); static_assert((Triple::OSType)ZigLLVM_ELFIAMCU == Triple::ELFIAMCU, ""); static_assert((Triple::OSType)ZigLLVM_TvOS == Triple::TvOS, ""); static_assert((Triple::OSType)ZigLLVM_WatchOS == Triple::WatchOS, ""); +static_assert((Triple::OSType)ZigLLVM_BridgeOS == Triple::BridgeOS, ""); static_assert((Triple::OSType)ZigLLVM_DriverKit == Triple::DriverKit, ""); static_assert((Triple::OSType)ZigLLVM_XROS == Triple::XROS, ""); static_assert((Triple::OSType)ZigLLVM_Mesa3D == Triple::Mesa3D, ""); @@ -746,7 +747,9 @@ static_assert((Triple::EnvironmentType)ZigLLVM_Miss == Triple::Miss, ""); static_assert((Triple::EnvironmentType)ZigLLVM_Callable == Triple::Callable, ""); static_assert((Triple::EnvironmentType)ZigLLVM_Mesh == Triple::Mesh, ""); static_assert((Triple::EnvironmentType)ZigLLVM_Amplification == Triple::Amplification, ""); +static_assert((Triple::EnvironmentType)ZigLLVM_OpenCL == Triple::OpenCL, ""); static_assert((Triple::EnvironmentType)ZigLLVM_OpenHOS == Triple::OpenHOS, ""); +static_assert((Triple::EnvironmentType)ZigLLVM_PAuthTest == Triple::PAuthTest, ""); static_assert((Triple::EnvironmentType)ZigLLVM_LastEnvironmentType == Triple::LastEnvironmentType, ""); static_assert((Triple::ObjectFormatType)ZigLLVM_UnknownObjectFormat == Triple::UnknownObjectFormat, ""); |