[llvm-commits] [compiler-rt] r81476 - in /compiler-rt/trunk: Makefile lib/i386/Makefile.mk lib/ppc/Makefile.mk lib/x86_64/Makefile.mk

[Daniel Dunbar]

Author: ddunbar
Date: Thu Sep 10 18:27:45 2009
New Revision: 81476

URL: http://llvm.org/viewvc/llvm-project?rev=81476&view=rev
Log:
Unbreak building of assembly files (broken by my .s -> .S rename).
 - Noticed & patched by Nick Kledzik.

 - This may expose portability issues in the .S files, if so we should either
   disable them on non-Darwin, or even better make them portable.

Modified:
    compiler-rt/trunk/Makefile
    compiler-rt/trunk/lib/i386/Makefile.mk
    compiler-rt/trunk/lib/ppc/Makefile.mk
    compiler-rt/trunk/lib/x86_64/Makefile.mk

Modified: compiler-rt/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/Makefile?rev=81476&r1=81475&r2=81476&view=diff

==============================================================================
--- compiler-rt/trunk/Makefile (original)
+++ compiler-rt/trunk/Makefile Thu Sep 10 18:27:45 2009
@@ -153,6 +153,11 @@
 	$(Verb) $(CC) -c -o $$@ $(ActiveFlags) $$<
 .PRECIOUS: $(ActiveObjPath)/.dir
 
+$(ActiveObjPath)/%.o: $(ActiveSrcPath)/%.S $(Dependencies) $(ActiveObjPath)/.dir
+	$(Summary) "  ASSEMBLE:  $(ActiveConfig)/$(ActiveArch): $$<"
+	$(Verb) $(CC) -c -o $$@ $(ActiveFlags) $$<
+.PRECIOUS: $(ActiveObjPath)/.dir
+
 $(ActiveObjPath)/%.o: $(ActiveSrcPath)/%.c $(Dependencies) $(ActiveObjPath)/.dir
 	$(Summary) "  COMPILE:   $(ActiveConfig)/$(ActiveArch): $$<"
 	$(Verb) $(CC) -c -o $$@ $(ActiveFlags) $$<

Modified: compiler-rt/trunk/lib/i386/Makefile.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/i386/Makefile.mk?rev=81476&r1=81475&r2=81476&view=diff

==============================================================================
--- compiler-rt/trunk/lib/i386/Makefile.mk (original)
+++ compiler-rt/trunk/lib/i386/Makefile.mk Thu Sep 10 18:27:45 2009
@@ -11,9 +11,9 @@
 SubDirs := 
 OnlyArchs := i386
 
-AsmSources := $(foreach file,$(wildcard $(Dir)/*.s),$(notdir $(file)))
+AsmSources := $(foreach file,$(wildcard $(Dir)/*.S),$(notdir $(file)))
 Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file)))
-ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.s=%.o)
+ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.S=%.o)
 Target := Optimized
 
 # FIXME: use automatic dependencies?

Modified: compiler-rt/trunk/lib/ppc/Makefile.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ppc/Makefile.mk?rev=81476&r1=81475&r2=81476&view=diff

==============================================================================
--- compiler-rt/trunk/lib/ppc/Makefile.mk (original)
+++ compiler-rt/trunk/lib/ppc/Makefile.mk Thu Sep 10 18:27:45 2009
@@ -11,9 +11,9 @@
 SubDirs := 
 OnlyArchs := ppc
 
-AsmSources := $(foreach file,$(wildcard $(Dir)/*.s),$(notdir $(file)))
+AsmSources := $(foreach file,$(wildcard $(Dir)/*.S),$(notdir $(file)))
 Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file)))
-ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.s=%.o)
+ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.S=%.o)
 Target := Optimized
 
 # FIXME: use automatic dependencies?

Modified: compiler-rt/trunk/lib/x86_64/Makefile.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/x86_64/Makefile.mk?rev=81476&r1=81475&r2=81476&view=diff

==============================================================================
--- compiler-rt/trunk/lib/x86_64/Makefile.mk (original)
+++ compiler-rt/trunk/lib/x86_64/Makefile.mk Thu Sep 10 18:27:45 2009
@@ -11,9 +11,9 @@
 SubDirs := 
 OnlyArchs := x86_64
 
-AsmSources := $(foreach file,$(wildcard $(Dir)/*.s),$(notdir $(file)))
+AsmSources := $(foreach file,$(wildcard $(Dir)/*.S),$(notdir $(file)))
 Sources := $(foreach file,$(wildcard $(Dir)/*.c),$(notdir $(file)))
-ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.s=%.o)
+ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.S=%.o)
 Target := Optimized
 
 # FIXME: use automatic dependencies?