From 1598df4c7dcfcd0cbcf94a3e0020595c8fea434d Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 4 Apr 2016 12:58:50 -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: I4430a76a749262b0234c194434b331f7294da009 --- core/combo/TARGET_linux-arm.mk | 3 --- core/combo/TARGET_linux-arm64.mk | 3 --- core/combo/TARGET_linux-mips.mk | 3 --- core/combo/TARGET_linux-mips64.mk | 5 ----- core/combo/TARGET_linux-x86.mk | 3 --- core/combo/TARGET_linux-x86_64.mk | 3 --- 6 files changed, 20 deletions(-) diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 510aae52f..d89a2cf1e 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -155,7 +155,6 @@ $(combo_2nd_arch_prefix)TARGET_RELEASE_CFLAGS := \ -frename-registers libc_root := bionic/libc -libm_root := bionic/libm ## on some hosts, the target cross-compiler is not available so do not run this command @@ -180,8 +179,6 @@ $(combo_2nd_arch_prefix)TARGET_C_INCLUDES := \ $(libc_root)/arch-arm/include \ $(libc_root)/include \ $(KERNEL_HEADERS) \ - $(libm_root)/include \ - $(libm_root)/include/arm \ $(combo_2nd_arch_prefix)TARGET_CRTBEGIN_STATIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o $(combo_2nd_arch_prefix)TARGET_CRTBEGIN_DYNAMIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk index 6a1d8619f..9ff49819d 100644 --- a/core/combo/TARGET_linux-arm64.mk +++ b/core/combo/TARGET_linux-arm64.mk @@ -135,7 +135,6 @@ TARGET_RELEASE_CFLAGS := \ -frename-registers libc_root := bionic/libc -libm_root := bionic/libm TARGET_LIBGCC := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \ -print-libgcc-file-name) @@ -153,8 +152,6 @@ TARGET_C_INCLUDES := \ $(libc_root)/arch-arm64/include \ $(libc_root)/include \ $(KERNEL_HEADERS) \ - $(libm_root)/include \ - $(libm_root)/include/arm64 \ TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk index 186d88f25..fcf4c9d17 100644 --- a/core/combo/TARGET_linux-mips.mk +++ b/core/combo/TARGET_linux-mips.mk @@ -126,7 +126,6 @@ $(combo_2nd_arch_prefix)TARGET_RELEASE_CFLAGS := \ -frename-registers libc_root := bionic/libc -libm_root := bionic/libm ## on some hosts, the target cross-compiler is not available so do not run this command @@ -155,8 +154,6 @@ $(combo_2nd_arch_prefix)TARGET_C_INCLUDES := \ $(libc_root)/arch-mips/include \ $(libc_root)/include \ $(KERNEL_HEADERS) \ - $(libm_root)/include \ - $(libm_root)/include/mips \ $(combo_2nd_arch_prefix)TARGET_CRTBEGIN_STATIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o $(combo_2nd_arch_prefix)TARGET_CRTBEGIN_DYNAMIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o diff --git a/core/combo/TARGET_linux-mips64.mk b/core/combo/TARGET_linux-mips64.mk index 3e1f61a0f..f869317a5 100644 --- a/core/combo/TARGET_linux-mips64.mk +++ b/core/combo/TARGET_linux-mips64.mk @@ -132,7 +132,6 @@ TARGET_RELEASE_CFLAGS := \ -frename-registers libc_root := bionic/libc -libm_root := bionic/libm ## on some hosts, the target cross-compiler is not available so do not run this command @@ -162,10 +161,6 @@ TARGET_C_INCLUDES := \ $(libc_root)/arch-mips64/include \ $(libc_root)/include \ $(KERNEL_HEADERS) \ - $(libm_root)/include \ - $(libm_root)/include/mips \ - -# TODO: perhaps use $(libm_root)/include/mips64 instead of mips ? TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 558ec3b6b..800a1dd7b 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -74,7 +74,6 @@ endif $(combo_2nd_arch_prefix)TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined libc_root := bionic/libc -libm_root := bionic/libm KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi KERNEL_HEADERS_COMMON += $(libc_root)/kernel/common @@ -135,8 +134,6 @@ $(combo_2nd_arch_prefix)TARGET_C_INCLUDES := \ $(libc_root)/arch-x86/include \ $(libc_root)/include \ $(KERNEL_HEADERS) \ - $(libm_root)/include \ - $(libm_root)/include/i387 \ $(combo_2nd_arch_prefix)TARGET_CRTBEGIN_STATIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o $(combo_2nd_arch_prefix)TARGET_CRTBEGIN_DYNAMIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index 12166ec47..bf31334b1 100644 --- a/core/combo/TARGET_linux-x86_64.mk +++ b/core/combo/TARGET_linux-x86_64.mk @@ -74,7 +74,6 @@ endif TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined libc_root := bionic/libc -libm_root := bionic/libm KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi KERNEL_HEADERS_COMMON += $(libc_root)/kernel/common @@ -144,8 +143,6 @@ TARGET_C_INCLUDES := \ $(libc_root)/arch-x86_64/include \ $(libc_root)/include \ $(KERNEL_HEADERS) \ - $(libm_root)/include \ - $(libm_root)/include/amd64 \ TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o -- 2.11.0