Bug 628606 - elfhack causes bustage since ARM target may not return arm. r=glandium,a=sdwilsh

build/unix/elfhack/Makefile.in

@@ -58,8 +58,12 @@ 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 \