This is an archive of the discontinued LLVM Phabricator instance.

Differential D10175

Fix OBJCOPY and AR for Android.
ClosedPublic

Authored by chaoren on Jun 1 2015, 5:17 PM.

Details

Reviewers
ovyalov
tberghammer
Commits
rG7d76a13bf3e8: Fix OBJCOPY and AR for Android.
rLLDB238849: Fix OBJCOPY and AR for Android.
rL238849: Fix OBJCOPY and AR for Android.
Summary

Previously, OBJCOPY was empty because of the missing comma,
and ar was just ar.

Diff Detail

Event Timeline

chaoren updated this revision to Diff 26940.Jun 1 2015, 5:17 PM
chaoren retitled this revision from to Fix OBJCOPY and AR for Android..
chaoren updated this object.
chaoren edited the test plan for this revision. (Show Details)
chaoren added reviewers: ovyalov, tberghammer.
chaoren added a subscriber: Unknown Object (MLST).
Herald added a subscriber: tberghammer. · View Herald TranscriptJun 1 2015, 5:17 PM
ovyalov accepted this revision.Jun 1 2015, 6:24 PM
ovyalov edited edge metadata.

LGTM

test/make/Makefile.rules
231

Do we need to setup LD here as well?

This revision is now accepted and ready to land.Jun 1 2015, 6:24 PM
chaoren added inline comments.Jun 1 2015, 6:32 PM
test/make/Makefile.rules
231

I think the linker is just CC. We don't invoke LD directly.

Closed by commit rL238849: Fix OBJCOPY and AR for Android. (authored by chaoren). · Explain WhyJun 2 2015, 9:47 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
test/
make/
20 lines

Diff 26940

test/make/Makefile.rules

Show First 20 Lines • Show All 210 Lines • ▼ Show 20 Lines ifneq (,$(findstring clang,$(CC)))
LDFLAGS += -fuse-ld=lld LDFLAGS += -fuse-ld=lld
endif endif
endif endif
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Android specific options # Android specific options
#---------------------------------------------------------------------- #----------------------------------------------------------------------
ifeq "$(OS)" "Android" ifeq "$(OS)" "Android"
objcopy_notdir = $(if $(findstring clang,$(1)), \
$(subst clang,objcopy,$(1)), \
$(if $(findstring gcc,$(1)), \
$(subst gcc,objcopy,$(1)), \
$(subst cc,objcopy,$(1))))))
objcopy = $(if $(findstring /,$(1)),$(join $(dir $(1)), $(call objcopy_notdir,$(notdir $(1)))),$(call objcopy_notdir,$(1)))
LDFLAGS += -pie LDFLAGS += -pie
OBJCOPY = $(call objcopy $(CC)) replace_with = $(if $(findstring clang,$(1)), \
$(subst clang,$(2),$(1)), \
$(if $(findstring gcc,$(1)), \
$(subst gcc,$(2),$(1)), \
$(subst cc,$(2),$(1))))
ifeq "$(notdir $(CC))" "$(CC)"
replace_cc_with = $(call replace_with,$(CC),$(1))
else
replace_cc_with = $(join $(dir $(CC)),$(call replace_with,$(notdir $(CC)),$(1)))
endif
OBJCOPY = $(call replace_cc_with,objcopy)
AR = $(call replace_cc_with,ar)
ovyalovUnsubmitted
Not Done
ReplyInline Actions

Do we need to setup LD here as well?

ovyalov: Do we need to setup LD here as well?
chaorenAuthorUnsubmitted
Not Done
ReplyInline Actions

I think the linker is just CC. We don't invoke LD directly.

chaoren: I think the linker is just CC. We don't invoke LD directly.
endif endif
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# C++ standard library options # C++ standard library options
#---------------------------------------------------------------------- #----------------------------------------------------------------------
ifeq (1,$(USE_LIBSTDCPP)) ifeq (1,$(USE_LIBSTDCPP))
# Clang requires an extra flag: -stdlib=libstdc++ # Clang requires an extra flag: -stdlib=libstdc++
ifneq (,$(findstring clang,$(CC))) ifneq (,$(findstring clang,$(CC)))
▲ Show 20 Lines • Show All 287 Lines • Show Last 20 Lines