From 71c36eb4513f2b02eb0d26e199a2303b43f82382 Mon Sep 17 00:00:00 2001 From: Ben Cheng Date: Mon, 28 Oct 2013 10:27:58 -0700 Subject: [PATCH] Add the search path for libgcc.a and crt*.o. Change-Id: I727f5630f7667b98770d779d43be6a7901471c55 --- core/combo/TARGET_linux-aarch64.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/combo/TARGET_linux-aarch64.mk b/core/combo/TARGET_linux-aarch64.mk index 067b0c6a89..3c7212ae26 100644 --- a/core/combo/TARGET_linux-aarch64.mk +++ b/core/combo/TARGET_linux-aarch64.mk @@ -125,6 +125,8 @@ libm_root := bionic/libm libstdc++_root := bionic/libstdc++ libthread_db_root := bionic/libthread_db +TARGET_LIBGCC := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \ + -print-libgcc-file-name) # unless CUSTOM_KERNEL_HEADERS is defined, we're going to use # symlinks located in out/ to point to the appropriate kernel @@ -148,14 +150,12 @@ TARGET_C_INCLUDES := \ $(libm_root)/include/aarch64 \ $(libthread_db_root)/include -# FIXME -# CRT* objects to be added later -TARGET_CRTBEGIN_STATIC_O := -TARGET_CRTBEGIN_DYNAMIC_O := -TARGET_CRTEND_O := +TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o +TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o +TARGET_CRTEND_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o -TARGET_CRTBEGIN_SO_O := -TARGET_CRTEND_SO_O := +TARGET_CRTBEGIN_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o +TARGET_CRTEND_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o TARGET_STRIP_MODULE:=true