[compiler-rt] r212696 - MachO: add dummy armv6m architecture directory so clang_macho_embedded builds things.

[Tim Northover]

Author: tnorthover
Date: Thu Jul 10 05:06:42 2014
New Revision: 212696

URL: http://llvm.org/viewvc/llvm-project?rev=212696&view=rev
Log:
MachO: add dummy armv6m architecture directory so clang_macho_embedded builds things.

Without some mention of armv6m in a subdirectory of builtins, the make code
doesn't even know that armv6m exists and is something it should be looking for
in the platform-specific Makefiles. This means that none of the functions
listed actually get built and we end up with an almost entirely empty
libclang_rt.a for armv6m.

Unfortunately, the assembly code in the usual arm directory has no hope of
running on armv6m, which only supports Thumb-1 (not even ARM mode), so adding
it there won't work. Realistically, we probably *will* want to put any
optimised versions in a separate directory, so creating it now is harmless.

rdar://problem/17613576

Added:
    compiler-rt/trunk/lib/builtins/armv6m/
    compiler-rt/trunk/lib/builtins/armv6m/Makefile.mk
      - copied, changed from r212690, compiler-rt/trunk/lib/builtins/Makefile.mk
Modified:
    compiler-rt/trunk/lib/builtins/Makefile.mk

Modified: compiler-rt/trunk/lib/builtins/Makefile.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/Makefile.mk?rev=212696&r1=212695&r2=212696&view=diff
==============================================================================
--- compiler-rt/trunk/lib/builtins/Makefile.mk (original)
+++ compiler-rt/trunk/lib/builtins/Makefile.mk Thu Jul 10 05:06:42 2014
@@ -11,7 +11,7 @@ ModuleName := builtins
 SubDirs :=
 
 # Add arch specific optimized implementations.
-SubDirs += i386 ppc x86_64 arm
+SubDirs += i386 ppc x86_64 arm armv6m
 
 # Define the variables for this specific directory.
 Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file)))

Copied: compiler-rt/trunk/lib/builtins/armv6m/Makefile.mk (from r212690, compiler-rt/trunk/lib/builtins/Makefile.mk)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/armv6m/Makefile.mk?p2=compiler-rt/trunk/lib/builtins/armv6m/Makefile.mk&p1=compiler-rt/trunk/lib/builtins/Makefile.mk&r1=212690&r2=212696&rev=212696&view=diff
==============================================================================
--- compiler-rt/trunk/lib/builtins/Makefile.mk (original)
+++ compiler-rt/trunk/lib/builtins/armv6m/Makefile.mk Thu Jul 10 05:06:42 2014
@@ -1,4 +1,4 @@
-#===- lib/builtins/Makefile.mk -----------------------------*- Makefile -*--===#
+#===- lib/builtins/arm/Makefile.mk -------------------------*- Makefile -*--===#
 #
 #                     The LLVM Compiler Infrastructure
 #
@@ -8,15 +8,13 @@
 #===------------------------------------------------------------------------===#
 
 ModuleName := builtins
-SubDirs :=
+SubDirs := 
+OnlyArchs := armv6m
 
-# Add arch specific optimized implementations.
-SubDirs += i386 ppc x86_64 arm
-
-# Define the variables for this specific directory.
+AsmSources := $(foreach file,$(wildcard $(Dir)/*.S),$(notdir $(file)))
 Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file)))
-ObjNames := $(Sources:%.c=%.o)
-Implementation := Generic
+ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.S=%.o)
+Implementation := Optimized
 
 # FIXME: use automatic dependencies?
-Dependencies := $(wildcard $(Dir)/*.h)
+Dependencies := $(wildcard lib/*.h $(Dir)/*.h)