[llvm-commits] [compiler-rt] r127057 - in /compiler-rt/trunk: lib/arm/softfloat-alias.list make/AppleBI.mk

[Nick Kledzik]

Author: kledzik
Date: Fri Mar  4 20:15:16 2011
New Revision: 127057

URL: http://llvm.org/viewvc/llvm-project?rev=127057&view=rev
Log:
<rdar://problem/9091300> update Apple packaging of compiler-rt

Added:
    compiler-rt/trunk/lib/arm/softfloat-alias.list
Modified:
    compiler-rt/trunk/make/AppleBI.mk

Added: compiler-rt/trunk/lib/arm/softfloat-alias.list
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/arm/softfloat-alias.list?rev=127057&view=auto
==============================================================================
--- compiler-rt/trunk/lib/arm/softfloat-alias.list (added)
+++ compiler-rt/trunk/lib/arm/softfloat-alias.list Fri Mar  4 20:15:16 2011
@@ -0,0 +1,21 @@
+#
+# These are soft float functions which can be 
+# aliased to the *vfp functions on arm processors
+# that support floating point instructions.
+#
+___adddf3vfp		___adddf3
+___addsf3vfp		___addsf3
+___divdf3vfp		___divdf3
+___divsf3vfp		___divsf3
+___extendsfdf2vfp	___extendsfdf2
+___fixdfsivfp		___fixdfsi
+___fixsfsivfp		___fixsfsi
+___floatsidfvfp		___floatsidf
+___floatsisfvfp		___floatsisf
+___muldf3vfp		___muldf3
+___mulsf3vfp		___mulsf3
+___subdf3vfp		___subdf3
+___subsf3vfp		___subsf3
+___truncdfsf2vfp	___truncdfsf2
+___floatunssidfvfp	___floatunsidf
+___floatunssisfvfp	___floatunsisf

Modified: compiler-rt/trunk/make/AppleBI.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/AppleBI.mk?rev=127057&r1=127056&r2=127057&view=diff
==============================================================================
--- compiler-rt/trunk/make/AppleBI.mk (original)
+++ compiler-rt/trunk/make/AppleBI.mk Fri Mar  4 20:15:16 2011
@@ -14,8 +14,14 @@
 
 ifeq (,$(SDKROOT))
 	INSTALL_TARGET = install-MacOSX
+    LD_OTHER_FLAGS =
 else
 	INSTALL_TARGET = install-iOS
+	CFLAGS.Release.armv6 := $(CFLAGS) -isysroot $(SDKROOT)
+	CFLAGS.Release.armv7 := $(CFLAGS) -isysroot $(SDKROOT)
+	CFLAGS.Static.armv6  := $(CFLAGS) -isysroot $(SDKROOT)
+	CFLAGS.Static.armv7  := $(CFLAGS) -isysroot $(SDKROOT)
+    LD_OTHER_FLAGS = -Wl,-alias_list,$(SRCROOT)/lib/arm/softfloat-alias.list
 endif
 
 
@@ -48,11 +54,11 @@
 # Rule to make each dylib slice
 $(OBJROOT)/libcompiler_rt-%.dylib : $(OBJROOT)/darwin_bni/Release/%/libcompiler_rt.a
 	echo "const char vers[] = \"@(#) $(RC_ProjectName)-$(RC_ProjectSourceVersion)\"; " > $(OBJROOT)/version.c
-	cc $(OBJROOT)/version.c -arch $* -dynamiclib \
+	$(CC.Release) $(OBJROOT)/version.c -arch $* -dynamiclib \
 	   -install_name /usr/lib/system/libcompiler_rt.dylib \
 	   -compatibility_version 1 -current_version $(RC_ProjectSourceVersion) \
 	   -nodefaultlibs -lSystem -umbrella System -dead_strip \
-	   -Wl,-force_load,$^ -o $@ 
+	   $(LD_OTHER_FLAGS) -Wl,-force_load,$^ -o $@ 
 
 # Rule to make fat dylib
 $(SYMROOT)/libcompiler_rt.dylib: $(foreach arch,$(RC_ARCHS), \
@@ -63,19 +69,15 @@
 
 
 # Copy results to DSTROOT.
-install-iOS: $(SYMROOT)/libcompiler_rt.a $(SYMROOT)/libcompiler_rt-static.a 
-	mkdir -p $(DSTROOT)/usr/local/lib/libgcc
-	cp $(SYMROOT)/libcompiler_rt.a \
-				    $(DSTROOT)/usr/local/lib/libgcc/libcompiler_rt.a
-	mkdir -p $(DSTROOT)/usr/local/
+install-iOS: $(SYMROOT)/libcompiler_rt-static.a \
+             $(SYMROOT)/libcompiler_rt.dylib
+	mkdir -p $(DSTROOT)/usr/local/lib
 	cp $(SYMROOT)/libcompiler_rt-static.a  \
 				    $(DSTROOT)/usr/local/lib/libcompiler_rt-static.a
+	mkdir -p $(DSTROOT)/usr/lib/system
+	strip -S $(SYMROOT)/libcompiler_rt.dylib \
+	    -o $(DSTROOT)/usr/lib/system/libcompiler_rt.dylib
 
-
-# Rule to make fat archive
-$(SYMROOT)/libcompiler_rt.a : $(foreach arch,$(RC_ARCHS), \
-                        $(OBJROOT)/darwin_bni/Release/$(arch)/libcompiler_rt.a)
-	lipo -create $^ -o  $@
 	
 # Rule to make fat archive
 $(SYMROOT)/libcompiler_rt-static.a : $(foreach arch,$(RC_ARCHS), \