From 6fb831bd5619992797eded6c47117b1a52c1f724 Mon Sep 17 00:00:00 2001
From: Yi Kong <yikong@google.com>
Date: Fri, 5 Oct 2018 19:46:01 +0000
Subject: [PATCH] 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
---
 cc/cc_test.go | 24 ------------------------
 cc/linker.go  | 12 +++++-------
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/cc/cc_test.go b/cc/cc_test.go
index 3fd771b7c..3d5dfb155 100644
--- a/cc/cc_test.go
+++ b/cc/cc_test.go
@@ -84,30 +84,6 @@ func createTestContext(t *testing.T, config android.Config, bp string) *android.
 			recovery_available: true,
 		}
 
-		toolchain_library {
-			name: "libclang_rt.builtins-arm-android",
-			vendor_available: true,
-			recovery_available: true,
-		}
-
-		toolchain_library {
-			name: "libclang_rt.builtins-aarch64-android",
-			vendor_available: true,
-			recovery_available: true,
-		}
-
-		toolchain_library {
-			name: "libclang_rt.builtins-i686-android",
-			vendor_available: true,
-			recovery_available: true,
-		}
-
-		toolchain_library {
-			name: "libclang_rt.builtins-x86_64-android",
-			vendor_available: true,
-			recovery_available: true,
-		}
-
 		toolchain_library {
 			name: "libgcc",
 			vendor_available: true,
diff --git a/cc/linker.go b/cc/linker.go
index 725be2236..9911b1659 100644
--- a/cc/linker.go
+++ b/cc/linker.go
@@ -16,7 +16,6 @@ package cc
 
 import (
 	"android/soong/android"
-	"android/soong/cc/config"
 	"fmt"
 
 	"github.com/google/blueprint"
@@ -215,13 +214,12 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
 		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")