diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-24 13:00:10 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-24 13:00:10 -0700 |
| commit | 713bac96d628d6ca040fb1fe5d7a8abdcb932553 (patch) | |
| tree | f43d1e99c5882cee69107a32f364a899a8dbd699 /core | |
| parent | 5ac65f869601df5e73fb84b67e57af8ef95cc3bf (diff) | |
| parent | 6c1f9ccfb1dbc04a32275bfb6133c1b122400f04 (diff) | |
| download | build-713bac96d628d6ca040fb1fe5d7a8abdcb932553.zip build-713bac96d628d6ca040fb1fe5d7a8abdcb932553.tar.gz build-713bac96d628d6ca040fb1fe5d7a8abdcb932553.tar.bz2 | |
Merge "ARM: put crtbegin_so.o at the beginning where it belongs"
Diffstat (limited to 'core')
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 14c3d28..cd36197 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -252,8 +252,8 @@ $(hide) $(PRIVATE_CXX) \ -Wl,--gc-sections \ -Wl,-shared,-Bsymbolic \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ - $(PRIVATE_ALL_OBJECTS) \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \ + $(PRIVATE_ALL_OBJECTS) \ -Wl,--whole-archive \ $(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ -Wl,--no-whole-archive \ |