Revert "Move libgcc to libcrt.builtins"
This reverts commit 77e62dbf599da68077f2c3c8178140155e8a0417.
Reason for revert: caused boot failure on mirror-aosp-master-with-vendor
Change-Id: I594df35878616dba8990d044d7cd529458a601b6
diff --git a/cc/linker.go b/cc/linker.go
index 725be22..9911b16 100644
--- a/cc/linker.go
+++ b/cc/linker.go
@@ -16,7 +16,6 @@
import (
"android/soong/android"
- "android/soong/cc/config"
"fmt"
"github.com/google/blueprint"
@@ -215,13 +214,12 @@
deps.WholeStaticLibs = removeListFromList(deps.WholeStaticLibs, linker.Properties.Target.Recovery.Exclude_static_libs)
}
- if ctx.toolchain().Bionic() {
- // libclang_rt.builtins, libgcc and libatomic have to be last on the command line
- // TODO: Also enable for libc and libm
- if ctx.ModuleName() != "libc" && ctx.ModuleName() != "libm" {
- deps.LateStaticLibs = append(deps.LateStaticLibs, config.BuiltinsRuntimeLibrary(ctx.toolchain()))
- }
+ if ctx.ModuleName() != "libcompiler_rt-extras" {
+ deps.LateStaticLibs = append(deps.LateStaticLibs, "libcompiler_rt-extras")
+ }
+ if ctx.toolchain().Bionic() {
+ // libgcc and libatomic have to be last on the command line
deps.LateStaticLibs = append(deps.LateStaticLibs, "libatomic")
if !Bool(linker.Properties.No_libgcc) {
deps.LateStaticLibs = append(deps.LateStaticLibs, "libgcc")