From 6bcbef6230a31c82e3d2c3a2d0f1c49b86c2a655 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Mon, 18 Jan 2010 06:49:09 +0000 Subject: [PATCH] Rename subdir 'Target' variable to 'Implementation' to be less overloaded. llvm-svn: 93718 --- compiler-rt/Makefile | 4 ++-- compiler-rt/lib/Makefile.mk | 2 +- compiler-rt/lib/arm/Makefile.mk | 2 +- compiler-rt/lib/i386/Makefile.mk | 2 +- compiler-rt/lib/ppc/Makefile.mk | 2 +- compiler-rt/lib/x86_64/Makefile.mk | 2 +- compiler-rt/make/lib_info.mk | 1 - compiler-rt/make/lib_util.mk | 8 ++++---- compiler-rt/make/subdir.mk | 6 +++--- 9 files changed, 14 insertions(+), 15 deletions(-) diff --git a/compiler-rt/Makefile b/compiler-rt/Makefile index 09e419aac962..2c66c2d1cf66 100644 --- a/compiler-rt/Makefile +++ b/compiler-rt/Makefile @@ -177,8 +177,8 @@ $(call Set,ActiveFlags,$(call GetArgs,$(ActiveConfig),$(ActiveArch))) $(call Set,ActiveObjects,$(ObjNames:%=$(ActiveObjPath)/%)) # Add to the input list for the appropriate library and update the dependency. -$(call Append,$(Target).Inputs.$(ActiveConfig).$(ActiveArch),$(ActiveObjects)) -$(ProjObjRoot)/$(ActiveConfig)/$(ActiveArch)/libcompiler_rt.$(Target).a: $(ActiveObjects) +$(call Append,$(Implementation).Inputs.$(ActiveConfig).$(ActiveArch),$(ActiveObjects)) +$(ProjObjRoot)/$(ActiveConfig)/$(ActiveArch)/libcompiler_rt.$(Implementation).a: $(ActiveObjects) $(ActiveObjPath)/%.o: $(ActiveSrcPath)/%.s $(Dependencies) $(ActiveObjPath)/.dir $(Summary) " ASSEMBLE: $(ActiveConfig)/$(ActiveArch): $$<" diff --git a/compiler-rt/lib/Makefile.mk b/compiler-rt/lib/Makefile.mk index ee04e0fec3ee..1ed8c11a08ba 100644 --- a/compiler-rt/lib/Makefile.mk +++ b/compiler-rt/lib/Makefile.mk @@ -11,7 +11,7 @@ SubDirs := i386 ppc x86_64 arm Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file))) ObjNames := $(Sources:%.c=%.o) -Target := Generic +Implementation := Generic # FIXME: use automatic dependencies? Dependencies := $(wildcard $(Dir)/*.h) diff --git a/compiler-rt/lib/arm/Makefile.mk b/compiler-rt/lib/arm/Makefile.mk index d3c3cb4f36b3..1dade0f65397 100644 --- a/compiler-rt/lib/arm/Makefile.mk +++ b/compiler-rt/lib/arm/Makefile.mk @@ -13,7 +13,7 @@ OnlyArchs := armv6 armv7 AsmSources := $(foreach file,$(wildcard $(Dir)/*.S),$(notdir $(file))) Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file))) ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.S=%.o) -Target := Optimized +Implementation := Optimized # FIXME: use automatic dependencies? Dependencies := $(wildcard lib/*.h $(Dir)/*.h) diff --git a/compiler-rt/lib/i386/Makefile.mk b/compiler-rt/lib/i386/Makefile.mk index 7ab112d6e4a3..20f95e651481 100644 --- a/compiler-rt/lib/i386/Makefile.mk +++ b/compiler-rt/lib/i386/Makefile.mk @@ -13,7 +13,7 @@ OnlyArchs := i386 AsmSources := $(foreach file,$(wildcard $(Dir)/*.S),$(notdir $(file))) Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file))) ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.S=%.o) -Target := Optimized +Implementation := Optimized # FIXME: use automatic dependencies? Dependencies := $(wildcard lib/*.h $(Dir)/*.h) diff --git a/compiler-rt/lib/ppc/Makefile.mk b/compiler-rt/lib/ppc/Makefile.mk index 41ccdba38bce..519d65467311 100644 --- a/compiler-rt/lib/ppc/Makefile.mk +++ b/compiler-rt/lib/ppc/Makefile.mk @@ -13,7 +13,7 @@ OnlyArchs := ppc AsmSources := $(foreach file,$(wildcard $(Dir)/*.S),$(notdir $(file))) Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file))) ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.S=%.o) -Target := Optimized +Implementation := Optimized # FIXME: use automatic dependencies? Dependencies := $(wildcard lib/*.h $(Dir)/*.h) diff --git a/compiler-rt/lib/x86_64/Makefile.mk b/compiler-rt/lib/x86_64/Makefile.mk index df72156c4697..09037b9fbc8a 100644 --- a/compiler-rt/lib/x86_64/Makefile.mk +++ b/compiler-rt/lib/x86_64/Makefile.mk @@ -13,7 +13,7 @@ OnlyArchs := x86_64 AsmSources := $(foreach file,$(wildcard $(Dir)/*.S),$(notdir $(file))) Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file))) ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.S=%.o) -Target := Optimized +Implementation := Optimized # FIXME: use automatic dependencies? Dependencies := $(wildcard lib/*.h $(Dir)/*.h) diff --git a/compiler-rt/make/lib_info.mk b/compiler-rt/make/lib_info.mk index d7fc607d32ce..1c673f36b86d 100644 --- a/compiler-rt/make/lib_info.mk +++ b/compiler-rt/make/lib_info.mk @@ -42,4 +42,3 @@ $(foreach arch,$(AvailableArchs),\ $(foreach key,$(SubDirKeys),\ $(foreach fn,$(basename $($(key).ObjNames)),\ $(call Append,AvailableIn.$(fn),$(key)))) - diff --git a/compiler-rt/make/lib_util.mk b/compiler-rt/make/lib_util.mk index 768558b4e845..0ff662614ecb 100644 --- a/compiler-rt/make/lib_util.mk +++ b/compiler-rt/make/lib_util.mk @@ -19,20 +19,20 @@ SelectFunctionDir = $(strip \ # defined with a certain specificity. SelectFunctionDirs_Opt_ConfigAndArch = $(strip \ $(foreach key,$(AvailableIn.$(3)),\ - $(if $(and $(call streq,Optimized,$($(key).Target)),\ + $(if $(and $(call streq,Optimized,$($(key).Implementation)),\ $(call contains,$($(key).OnlyConfigs),$(1)),\ $(call contains,$($(key).OnlyArchs),$(2))),$(key),))) SelectFunctionDirs_Opt_Config = $(strip \ $(foreach key,$(AvailableIn.$(3)),\ - $(if $(and $(call streq,Optimized,$($(key).Target)),\ + $(if $(and $(call streq,Optimized,$($(key).Implementation)),\ $(call contains,$($(key).OnlyConfigs),$(1))),$(key),))) SelectFunctionDirs_Opt_Arch = $(strip \ $(foreach key,$(AvailableIn.$(3)),\ - $(if $(and $(call streq,Optimized,$($(key).Target)),\ + $(if $(and $(call streq,Optimized,$($(key).Implementation)),\ $(call contains,$($(key).OnlyArchs),$(2))),$(key),))) SelectFunctionDirs_Gen = $(strip \ $(foreach key,$(AvailableIn.$(3)),\ - $(if $(call streq,Generic,$($(key).Target)),$(key)))) + $(if $(call streq,Generic,$($(key).Implementation)),$(key)))) # Helper function to select the right set of dirs in generic priority order. SelectFunctions_Gen = \ diff --git a/compiler-rt/make/subdir.mk b/compiler-rt/make/subdir.mk index cf767f876a5a..4b1b83e08922 100644 --- a/compiler-rt/make/subdir.mk +++ b/compiler-rt/make/subdir.mk @@ -3,8 +3,8 @@ # Subdirectory makefiles must define: # SubDirs - The subdirectories to traverse. # ObjNames - The objects available in that directory. -# Target - The library configuration the objects should go in (Generic or -# Optimized) +# Implementation - The library configuration the objects should go in (Generic or +# Optimized) # Dependencies - Any dependences for the object files. # # Subdirectory makefiles may define: @@ -44,7 +44,7 @@ $(foreach config,$(ConfigsToTraverse), \ # The list of variables which are intended to be overridden in a subdirectory # makefile. -RequiredSubdirVariables := SubDirs ObjNames Target Dependencies +RequiredSubdirVariables := SubDirs ObjNames Implementation Dependencies OptionalSubdirVariables := OnlyArchs OnlyConfigs # Template: subdir_traverse_template subdir