From 852442957bf35e9dced80ec01d8a72da28743ea5 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Mon, 4 Apr 2016 12:58:03 -0700
Subject: [PATCH] libm's headers have moved to live with their libc cousins.

(To reduce the need for this kind of thing in the various build systems.)

Change-Id: I75d11497bbf42695f804bcc9ea9ba3b3a12ac764
---
 cc/arm64_device.go  | 2 --
 cc/arm_device.go    | 2 --
 cc/cc.go            | 1 -
 cc/mips64_device.go | 2 --
 cc/mips_device.go   | 2 --
 cc/x86_64_device.go | 2 --
 cc/x86_device.go    | 2 --
 7 files changed, 13 deletions(-)

diff --git a/cc/arm64_device.go b/cc/arm64_device.go
index 284e5bd05..1a0408c61 100644
--- a/cc/arm64_device.go
+++ b/cc/arm64_device.go
@@ -103,8 +103,6 @@ func init() {
 		"-isystem ${LibcRoot}/include",
 		"-isystem ${LibcRoot}/kernel/uapi",
 		"-isystem ${LibcRoot}/kernel/uapi/asm-arm64",
-		"-isystem ${LibmRoot}/include",
-		"-isystem ${LibmRoot}/include/arm64",
 	}, " "))
 
 	pctx.StaticVariable("arm64ClangCflags", strings.Join(clangFilterUnknownCflags(arm64Cflags), " "))
diff --git a/cc/arm_device.go b/cc/arm_device.go
index c122664fe..ea7db4315 100644
--- a/cc/arm_device.go
+++ b/cc/arm_device.go
@@ -167,8 +167,6 @@ func init() {
 		"-isystem ${LibcRoot}/include",
 		"-isystem ${LibcRoot}/kernel/uapi",
 		"-isystem ${LibcRoot}/kernel/uapi/asm-arm",
-		"-isystem ${LibmRoot}/include",
-		"-isystem ${LibmRoot}/include/arm",
 	}, " "))
 
 	// Extended cflags
diff --git a/cc/cc.go b/cc/cc.go
index 3b3128f36..f3400e7cd 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -65,7 +65,6 @@ var (
 	HostPrebuiltTag = pctx.VariableConfigMethod("HostPrebuiltTag", common.Config.PrebuiltOS)
 
 	LibcRoot = pctx.SourcePathVariable("LibcRoot", "bionic/libc")
-	LibmRoot = pctx.SourcePathVariable("LibmRoot", "bionic/libm")
 )
 
 // Flags used by lots of devices.  Putting them in package static variables will save bytes in
diff --git a/cc/mips64_device.go b/cc/mips64_device.go
index 65e6e2673..8f85b47e7 100644
--- a/cc/mips64_device.go
+++ b/cc/mips64_device.go
@@ -105,8 +105,6 @@ func init() {
 		"-isystem ${LibcRoot}/include",
 		"-isystem ${LibcRoot}/kernel/uapi",
 		"-isystem ${LibcRoot}/kernel/uapi/asm-mips",
-		"-isystem ${LibmRoot}/include",
-		"-isystem ${LibmRoot}/include/mips",
 	}, " "))
 
 	// Clang cflags
diff --git a/cc/mips_device.go b/cc/mips_device.go
index cd92eab14..ba67c0bb7 100644
--- a/cc/mips_device.go
+++ b/cc/mips_device.go
@@ -137,8 +137,6 @@ func init() {
 		"-isystem ${LibcRoot}/include",
 		"-isystem ${LibcRoot}/kernel/uapi",
 		"-isystem ${LibcRoot}/kernel/uapi/asm-mips",
-		"-isystem ${LibmRoot}/include",
-		"-isystem ${LibmRoot}/include/mips",
 	}, " "))
 
 	// Clang cflags
diff --git a/cc/x86_64_device.go b/cc/x86_64_device.go
index dd8972d91..24c444e99 100644
--- a/cc/x86_64_device.go
+++ b/cc/x86_64_device.go
@@ -152,8 +152,6 @@ func init() {
 		"-isystem ${LibcRoot}/include",
 		"-isystem ${LibcRoot}/kernel/uapi",
 		"-isystem ${LibcRoot}/kernel/uapi/asm-x86",
-		"-isystem ${LibmRoot}/include",
-		"-isystem ${LibmRoot}/include/amd64",
 	}, " "))
 
 	// Clang cflags
diff --git a/cc/x86_device.go b/cc/x86_device.go
index 5ba442c60..92cae9271 100644
--- a/cc/x86_device.go
+++ b/cc/x86_device.go
@@ -154,8 +154,6 @@ func init() {
 		"-isystem ${LibcRoot}/include",
 		"-isystem ${LibcRoot}/kernel/uapi",
 		"-isystem ${LibcRoot}/kernel/uapi/asm-x86",
-		"-isystem ${LibmRoot}/include",
-		"-isystem ${LibmRoot}/include/i387",
 	}, " "))
 
 	// Clang cflags