Bug 628606 - elfhack causes bustage since ARM target may not return arm. r=glandium,a=sdwilsh
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Fri, 28 Jan 2011 09:22:59 +0100
changeset 61513 712162d0a093097abfced080c639c8246ceb5bee
parent 61512 32542df68da39768b7d7e88014ac2e898f6fbded
child 61514 102d318965db65fc68ee4c14640b80a2039cd7cc
push idunknown
push userunknown
push dateunknown
reviewersglandium, sdwilsh
bugs628606
milestone2.0b11pre
Bug 628606 - elfhack causes bustage since ARM target may not return arm. r=glandium,a=sdwilsh
build/unix/elfhack/Makefile.in
--- a/build/unix/elfhack/Makefile.in
+++ b/build/unix/elfhack/Makefile.in
@@ -53,18 +53,22 @@ HOST_CPPSRCS = \
   elfhack.cpp \
   $(NULL)
 
 OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions
 
 ifneq (,$(filter %86,$(TARGET_CPU)))
 CPU := x86
 else
+ifneq (,$(filter arm%,$(TARGET_CPU)))
+CPU := arm
+else
 CPU := $(TARGET_CPU)
 endif
+endif
 
 CSRCS := \
   inject/$(CPU).c \
   inject/$(CPU)-noinit.c \
   $(NULL)
 
 libs:: $(CSRCS:.c=.$(OBJ_SUFFIX))