StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set -fsjlj-exceptions for all 32-bit Windows compiles" am: 0710d8e1cc

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1424708

Change-Id: Id19f535d03b89c3a501dc5fb8cf1764b594a1ad4
This commit is contained in:
Pirama Arumuga Nainar
2020-09-11 01:00:24 +00:00
committed by Automerger Merge Worker
parent f668809c90 0710d8e1cc
commit 46ac90bd23
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/config/x86_windows_host.go
View File

@@ -49,7 +49,11 @@ var (
windowsClangCppflags = []string{} windowsClangCppflags = []string{}
windowsX86ClangCppflags = []string{} windowsX86ClangCppflags = []string{
// Use SjLj exceptions for 32-bit. libgcc_eh implements SjLj
// exception model for 32-bit.
"-fsjlj-exceptions",
}
windowsX8664ClangCppflags = []string{} windowsX8664ClangCppflags = []string{}

5
cc/stl.go
View File

@@ -239,11 +239,6 @@ func (stl *stl) flags(ctx ModuleContext, flags Flags) Flags {
flags.Local.CppFlags = append(flags.Local.CppFlags, "-nostdinc++") flags.Local.CppFlags = append(flags.Local.CppFlags, "-nostdinc++")
flags.extraLibFlags = append(flags.extraLibFlags, "-nostdlib++") flags.extraLibFlags = append(flags.extraLibFlags, "-nostdlib++")
if ctx.Windows() { if ctx.Windows() {
// Use SjLj exceptions for 32-bit. libgcc_eh implements SjLj
// exception model for 32-bit.
if ctx.Arch().ArchType == android.X86 {
flags.Local.CppFlags = append(flags.Local.CppFlags, "-fsjlj-exceptions")
}
flags.Local.CppFlags = append(flags.Local.CppFlags, flags.Local.CppFlags = append(flags.Local.CppFlags,
// Disable visiblity annotations since we're using static // Disable visiblity annotations since we're using static
// libc++. // libc++.