Remove old build logic, this is going to be replaced by a more configurable mechanism shortly.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@93719 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 0 insertions, 66 deletions

diff --git a/make/config.mk b/make/config.mk
index 903424d01..5dfc74ca1 100644
--- a/make/config.mk
+++ b/make/config.mk
@@ -8,48 +8,6 @@ OS := $(shell uname)
 ProjSrcRoot := $(shell pwd)
 ProjObjRoot := $(ProjSrcRoot)
 
-Configs := Debug Release Profile
-
-# The full list of architectures we support.
-Archs := i386 ppc x86_64
-# armv6 armv7
-
-# If TargetArch is defined, only build for that architecture (and don't use
-# -arch).
-ifeq ($(OS), Darwin)
-  TargetArch :=
-  TargetArchs := $(Archs)
-else
-  TargetArch := i386
-  TargetArchs := $(TargetArch)
-endif
-
-Common.CFLAGS := -Wall -Werror
-
-# These names must match the configs, see GetArgs function.
-Debug.CFLAGS := -g
-Release.CFLAGS := -O3 -fomit-frame-pointer
-Profile.CFLAGS := -pg -g
-
-# Function: GetArchArgs arch
-#
-# Return the compiler flags for the given arch.
-ifeq ($(OS), Darwin)
-  GetArchArgs = -arch $(1)
-else
-  # Check that we are only trying to build the target arch.
-  GetArchArgs = $(if $(subst $(TargetArch),,$(1)), \
-	$(error "Invalid configuration, no -arch support: $(1)"), \
-	)
-endif
-
-# Function: GetArgs config arch
-#
-# Return the compiler flags for the given config & arch.
-GetArgs = $(if $($(1).CFLAGS), \
-	        $(Common.CFLAGS) $($(1).CFLAGS) $(call GetArchArgs,$(2)), \
-		$(error "Invalid configuration: $(1)"))
-
 ###
 # Tool configuration variables.
 
diff --git a/make/subdir.mk b/make/subdir.mk
index 4b1b83e08..b0981dcb6 100644
--- a/make/subdir.mk
+++ b/make/subdir.mk
@@ -15,30 +15,6 @@ ifeq ($(Dir),)
   $(error "No Dir variable defined.")
 endif
 
-# Expand template for each configuration and architecture.
-#
-# FIXME: This level of logic should be in primary Makefile?
-ifeq ($(OnlyConfigs),)
-  ConfigsToTraverse := $(Configs)
-else
-  ConfigsToTraverse := $(OnlyConfigs)
-endif
-
-ifeq ($(OnlyArchs),)
-  ArchsToTraverse := $(Archs)
-else
-  ArchsToTraverse := $(OnlyArchs)
-endif
-
-# If we are only targetting a single arch, only traverse that.
-ifneq ($(TargetArch),)
-  ArchsToTraverse := $(filter $(TargetArch), $(ArchsToTraverse))
-endif
-
-$(foreach config,$(ConfigsToTraverse), \
-  $(foreach arch,$(ArchsToTraverse), \
-    $(eval $(call CNA_subdir_template,$(config),$(arch),$(Dir)))))
-
 ###
 # Include child makefile fragments