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

Merge "Do not re-export _Unwind_XXX symbols."

Browse Source
This commit is contained in:
Christopher Ferris
2019-04-12 04:42:43 +00:00
committed by Gerrit Code Review
parent 8235220a82 c3a1e22060
commit 41eed99dc7
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cc/config/global.go
View File

@@ -83,6 +83,7 @@ var (
"-Wl,--warn-shared-textrel", "-Wl,--warn-shared-textrel",
"-Wl,--fatal-warnings", "-Wl,--fatal-warnings",
"-Wl,--no-undefined-version", "-Wl,--no-undefined-version",
"-Wl,--exclude-libs,libgcc.a",
} }
deviceGlobalLldflags = append(ClangFilterUnknownLldflags(deviceGlobalLdflags), deviceGlobalLldflags = append(ClangFilterUnknownLldflags(deviceGlobalLdflags),

5
cc/stl.go
View File

@@ -245,7 +245,10 @@ func (stl *stl) flags(ctx ModuleContext, flags Flags) Flags {
ndkSrcRoot := android.PathForSource(ctx, "prebuilts/ndk/current/sources/cxx-stl/system/include") ndkSrcRoot := android.PathForSource(ctx, "prebuilts/ndk/current/sources/cxx-stl/system/include")
flags.CFlags = append(flags.CFlags, "-isystem "+ndkSrcRoot.String()) flags.CFlags = append(flags.CFlags, "-isystem "+ndkSrcRoot.String())
case "ndk_libc++_shared", "ndk_libc++_static": case "ndk_libc++_shared", "ndk_libc++_static":
// Nothing. if ctx.Arch().ArchType == android.Arm {
// Make sure the _Unwind_XXX symbols are not re-exported.
flags.LdFlags = append(flags.LdFlags, "-Wl,--exclude-libs,libunwind.a")
}
case "": case "":
// None or error. // None or error.
if !ctx.toolchain().Bionic() { if !ctx.toolchain().Bionic() {