tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am a7f9179e: Merge "Enable shared libraries to use crtbegin_so.S and crtend_so.S" into gingerbread

Browse source 
Merge commit 'a7f9179ecc7e2c4b70cf6eedb8ea785a00efb4c3' into gingerbread-plus-aosp

* commit 'a7f9179ecc7e2c4b70cf6eedb8ea785a00efb4c3':
  Enable shared libraries to use crtbegin_so.S and crtend_so.S
This commit is contained in:
David 'Digit' Turner 2010-06-25 10:45:00 -07:00 committed by Android Git Automerger
commit 5cd0870e62
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/combo/TARGET_linux-arm.mk
View file

@ -211,6 +211,9 @@ TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_static.o
TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_dynamic.o TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_dynamic.o
TARGET_CRTEND_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_android.o TARGET_CRTEND_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_android.o
TARGET_CRTBEGIN_SO_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_so.o
TARGET_CRTEND_SO_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_so.o
TARGET_STRIP_MODULE:=true TARGET_STRIP_MODULE:=true
TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm
@ -229,6 +232,7 @@ $(TARGET_CXX) \
-Wl,-shared,-Bsymbolic \ -Wl,-shared,-Bsymbolic \
$(TARGET_GLOBAL_LD_DIRS) \ $(TARGET_GLOBAL_LD_DIRS) \
$(PRIVATE_ALL_OBJECTS) \ $(PRIVATE_ALL_OBJECTS) \
$(TARGET_CRTBEGIN_SO_O) \
-Wl,--whole-archive \ -Wl,--whole-archive \
$(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ $(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
-Wl,--no-whole-archive \ -Wl,--no-whole-archive \
@ -238,7 +242,8 @@ $(TARGET_CXX) \
$(TARGET_GLOBAL_LDFLAGS) \ $(TARGET_GLOBAL_LDFLAGS) \
$(PRIVATE_LDFLAGS) \ $(PRIVATE_LDFLAGS) \
$(TARGET_FDO_LIB) \ $(TARGET_FDO_LIB) \
$(TARGET_LIBGCC) $(TARGET_LIBGCC) \
$(TARGET_CRTEND_SO_O)
endef endef
define transform-o-to-executable-inner define transform-o-to-executable-inner