[NaCl SDK] Second phase of enable glibc arm toolchain

native_client_sdk/src/tools/nacl_gcc.mk

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 #
 # GNU Make based build file.  For details on GNU Make see:
 #   http://www.gnu.org/software/make/manual/make.html
 #
 
 #
 # Macros for TOOLS
 #
 ifneq ($(TOOLCHAIN),bionic)
 X86_32_CC := $(NACL_COMPILER_PREFIX) $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) -a x86_32 --tool=cc)
 X86_32_CXX := $(NACL_COMPILER_PREFIX) $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) -a x86_32 --tool=c++)
 X86_32_LINK := $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) -a x86_32 --tool=c++)
 X86_32_LIB := $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) -a x86_32 --tool=ar)
 X86_32_STRIP := $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) -a x86_32 --tool=strip)
 X86_32_NM := $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) -a x86_32 --tool=nm)
 
 X86_64_CC := $(NACL_COMPILER_PREFIX) $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) -a x86_64 --tool=cc)
 X86_64_CXX := $(NACL_COMPILER_PREFIX) $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) -a x86_64 --tool=c++)
 X86_64_LINK := $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) -a x86_64 --tool=c++)
 X86_64_LIB := $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) -a x86_64 --tool=ar)
 X86_64_STRIP := $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) -a x86_64 --tool=strip)
 X86_64_NM := $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) -a x86_64 --tool=nm)
 endif
 
-ifneq (,$(findstring $(TOOLCHAIN),newlib bionic clang-newlib))
-ARM_SUPPORT=1
-endif
-
-ifdef ENABLE_ARM_GLIBC
-ARM_SUPPORT=1
-endif
-
-ifeq ($(ARM_SUPPORT),1)
 ARM_CC := $(NACL_COMPILER_PREFIX) $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) -a arm --tool=cc)
 ARM_CXX := $(NACL_COMPILER_PREFIX) $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) -a arm --tool=c++)
 ARM_LINK := $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) -a arm --tool=c++)
 ARM_LIB := $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) -a arm --tool=ar)
 ARM_STRIP := $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) -a arm --tool=strip)
 ARM_NM := $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) -a arm --tool=nm)
-endif
 
 NCVAL ?= python $(NACL_SDK_ROOT)/tools/ncval.py
 
 # Architecture-specific variables
 ifeq (,$(MULTI_PLATFORM))
 X86_32_OUTDIR ?= $(OUTDIR)
 X86_64_OUTDIR ?= $(OUTDIR)
 ARM_OUTDIR ?= $(OUTDIR)
 else
 X86_32_OUTDIR ?= $(OUTDIR)/_platform_specific/x86-32
@@ skipping 125 matching lines @@
 endif
 endef
 
 #
 # Determine which architectures to build for.  The user can set NACL_ARCH or
 # ARCHES in the environment to control this.
 #
 ifneq ($(TOOLCHAIN),bionic)
 VALID_ARCHES := x86_32 x86_64
 endif
-ifeq ($(ARM_SUPPORT),1)
 VALID_ARCHES += arm
-endif
 
 ifdef NACL_ARCH
 ifeq (,$(findstring $(NACL_ARCH),$(VALID_ARCHES)))
 $(error Invalid arch specified in NACL_ARCH: $(NACL_ARCH).  Valid values are: $(VALID_ARCHES))
 endif
 ARCHES = ${NACL_ARCH}
 else
 ARCHES ?= ${VALID_ARCHES}
 endif
 
@@ skipping 117 matching lines @@
         $(call LOG,LIB ,$$@,$(X86_64_LIB) -cr $$@ $$^)
 
 $(STAMPDIR)/$(1).stamp: $(LIBDIR)/$(TOOLCHAIN)_x86_64/$(CONFIG_DIR)/lib$(1).a
 install: $(LIBDIR)/$(TOOLCHAIN)_x86_64/$(CONFIG_DIR)/lib$(1).a
 $(LIBDIR)/$(TOOLCHAIN)_x86_64/$(CONFIG_DIR)/lib$(1).a: $(X86_64_OUTDIR)/lib$(1)_x86_64.a
         $(MKDIR) -p $$(dir $$@)
         $(call LOG,CP  ,$$@,$(OSHELPERS) cp $$^ $$@)
 endif
 
 ifneq (,$(findstring arm,$(ARCHES)))
-ifeq ($(ARM_SUPPORT),1)
 all: $(ARM_OUTDIR)/lib$(1)_arm.a
 $(ARM_OUTDIR)/lib$(1)_arm.a: $(foreach src,$(2),$(call SRC_TO_OBJ,$(src),_arm))
         $(MKDIR) -p $$(dir $$@)
         $(RM) -f $$@
         $(call LOG,LIB ,$$@,$(ARM_LIB) -cr $$@ $$^)
 
 $(STAMPDIR)/$(1).stamp: $(LIBDIR)/$(TOOLCHAIN)_arm/$(CONFIG_DIR)/lib$(1).a
 install: $(LIBDIR)/$(TOOLCHAIN)_arm/$(CONFIG_DIR)/lib$(1).a
 $(LIBDIR)/$(TOOLCHAIN)_arm/$(CONFIG_DIR)/lib$(1).a: $(ARM_OUTDIR)/lib$(1)_arm.a
         $(MKDIR) -p $$(dir $$@)
         $(call LOG,CP  ,$$@,$(OSHELPERS) cp $$^ $$@)
 endif
-endif
 endef
 
 
 #
 # Specific Link Macro
 #
 # $1 = Target name
 # $2 = List of source files
 # $3 = List of LIBS
 # $4 = List of DEPS
@@ skipping 211 matching lines @@
         $(error Cannot run in sel_ldr unless $$NACL_ARCH is set)
 endif
         $(SEL_LDR_PATH) $(SEL_LDR_ARGS) $(OUTDIR)/$(TARGET)_$(NACL_ARCH).nexe -- $(EXE_ARGS)
 
 debug: all
 ifndef NACL_ARCH
         $(error Cannot run in sel_ldr unless $$NACL_ARCH is set)
 endif
         $(SEL_LDR_PATH) -d $(SEL_LDR_ARGS) $(OUTDIR)/$(TARGET)_$(NACL_ARCH).nexe -- $(EXE_ARGS)
 endif