diff options
| author | Colin Cross <ccross@android.com> | 2015-02-05 01:57:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-05 01:57:28 +0000 |
| commit | da2c0a708ed6c0091f3f89fd8838292579dad800 (patch) | |
| tree | 366ffdc2136629ea65b5086c3b3a1bbd3a582c14 /libc/arch-arm64 | |
| parent | 17976019a13a94ae428849bfe297f8e531f95013 (diff) | |
| parent | 5b869c0bbf8a2924ab69d86a98e9a25558d33494 (diff) | |
| download | bionic-da2c0a708ed6c0091f3f89fd8838292579dad800.zip bionic-da2c0a708ed6c0091f3f89fd8838292579dad800.tar.gz bionic-da2c0a708ed6c0091f3f89fd8838292579dad800.tar.bz2 | |
Merge changes Ib87855e8,I4b46ae20,I66364a5c,Id3fcf680
* changes:
Use LOCAL_LDFLAGS_64 instead of enumerating 64-bit architectures
Fix typo in cpu variant makefile depenendency for arm64
Remove libc_static_common_src_files
Share LP32 makefile settings between arches
Diffstat (limited to 'libc/arch-arm64')
| -rw-r--r-- | libc/arch-arm64/arm64.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/arch-arm64/arm64.mk b/libc/arch-arm64/arm64.mk index ba78871..8418993 100644 --- a/libc/arch-arm64/arm64.mk +++ b/libc/arch-arm64/arm64.mk @@ -59,6 +59,6 @@ ifeq ($(wildcard $(cpu_variant_mk)),) $(error "TARGET_CPU_VARIANT not set or set to an unknown value. Possible values are generic, denver64. Use generic for devices that do not have a CPU similar to any of the supported cpu variants.") endif include $(cpu_variant_mk) -libc_common_additional_dependencies += $(cpu_variank_mk) +libc_common_additional_dependencies += $(cpu_variant_mk) cpu_variant_mk := |