diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-05-30 07:46:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-30 07:46:14 +0000 |
| commit | dc41aa3254cbf443dd08c827e587cf261d1f7b82 (patch) | |
| tree | f63aaad41167691e599e23b6de4c58ff4732a102 /core/combo/TARGET_linux-arm64.mk | |
| parent | f4115cdfac6bfde8e3d7cab1e7782d078d764209 (diff) | |
| parent | 5c2c70de88a6c126460c88cfa64561d7cb2cc030 (diff) | |
| download | build-dc41aa3254cbf443dd08c827e587cf261d1f7b82.zip build-dc41aa3254cbf443dd08c827e587cf261d1f7b82.tar.gz build-dc41aa3254cbf443dd08c827e587cf261d1f7b82.tar.bz2 | |
am 5c2c70de: Merge "Add -latomic to all target builds"
* commit '5c2c70de88a6c126460c88cfa64561d7cb2cc030':
Add -latomic to all target builds
Diffstat (limited to 'core/combo/TARGET_linux-arm64.mk')
| -rw-r--r-- | core/combo/TARGET_linux-arm64.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk index 1b6e733..e6c35a9 100644 --- a/core/combo/TARGET_linux-arm64.mk +++ b/core/combo/TARGET_linux-arm64.mk @@ -132,6 +132,8 @@ libstdc++_root := bionic/libstdc++ TARGET_LIBGCC := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \ -print-libgcc-file-name) +TARGET_LIBATOMIC := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \ + -print-file-name=libatomic.a) KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH) @@ -178,6 +180,7 @@ $(hide) $(PRIVATE_CXX) \ -o $@ \ $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ $(PRIVATE_LDFLAGS) \ + $(PRIVATE_TARGET_LIBATOMIC) \ $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) \ $(PRIVATE_LDLIBS) @@ -204,6 +207,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ -o $@ \ $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ $(PRIVATE_LDFLAGS) \ + $(PRIVATE_TARGET_LIBATOMIC) \ $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \ $(PRIVATE_LDLIBS) @@ -226,6 +230,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \ $(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \ $(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \ $(PRIVATE_TARGET_FDO_LIB) \ + $(PRIVATE_TARGET_LIBATOMIC) \ $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \ -Wl,--end-group \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) |