[llvm-commits] [poolalloc] r156057 - in /poolalloc/trunk/test: Makefile pa/regression/2010-09-14-Fptr.c pa/regression/2010-09-14-Fptr_helper.c

[Will Dietz]

Author: wdietz2
Date: Wed May  2 21:35:42 2012
New Revision: 156057

URL: http://llvm.org/viewvc/llvm-project?rev=156057&view=rev
Log:
Accounting for lack of bytecode, update pa lit tests to use native lib.

(Making these pass again for those using a fresh build)

Modified:
    poolalloc/trunk/test/Makefile
    poolalloc/trunk/test/pa/regression/2010-09-14-Fptr.c
    poolalloc/trunk/test/pa/regression/2010-09-14-Fptr_helper.c

Modified: poolalloc/trunk/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/Makefile?rev=156057&r1=156056&r2=156057&view=diff
==============================================================================
--- poolalloc/trunk/test/Makefile (original)
+++ poolalloc/trunk/test/Makefile Wed May  2 21:35:42 2012
@@ -418,10 +418,10 @@
 DSAOPT := $(PROJ_OBJ_ROOT)/test/tools/dsaopt
 ADSAOPT := $(PROJ_OBJ_ROOT)/test/tools/adsaopt
 PAOPT := $(PROJ_OBJ_ROOT)/test/tools/paopt
-TC_LINK := $(PROJ_OBJ_ROOT)/test/tools/tc-link
-PA_LINK := $(PROJ_OBJ_ROOT)/test/tools/pa-link
+TC_BUILD := $(PROJ_OBJ_ROOT)/test/tools/tc-build
+PA_BUILD := $(PROJ_OBJ_ROOT)/test/tools/pa-build
 
-TOOLS= $(DSAOPT) $(PAOPT) $(ADSAOPT) $(TC_LINK) $(PA_LINK)
+TOOLS= $(DSAOPT) $(PAOPT) $(ADSAOPT) $(TC_BUILD) $(PA_BUILD)
 
 #wrapper script for 'opt' so we can avoid manually loading the dsa lib
 $(DSAOPT):
@@ -447,18 +447,22 @@
 	@mv $@.tmp $@
 
 #wrapper script for llvm-ld that links the type checking runtime
-$(TC_LINK):
+$(TC_BUILD):
 	@mkdir -p `dirname $@`
 	@echo "#!/bin/sh" > $@.tmp
-	@echo 'llvm-ld -link-as-library $$@ $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/libtypechecks_rt.bca ' >> $@.tmp
+	@echo 'llc $$1 -o $$1.tc.S' >> $@.tmp
+	@echo 'clang $$1.tc.S -o $$2 -ltypechecks_rt -L$(PROJ_OBJ_ROOT)/$(BuildMode)/lib' \
+		'-Wl,-rpath $(PROJ_OBJ_ROOT)/$(BuildMode)/lib' >> $@.tmp
 	@chmod +x $@.tmp
 	@mv $@.tmp $@
 
-#wrapper script for llvm-ld that links the poolalloc runtime
-$(PA_LINK):
+#wrapper script for building bitcode and linking in poolalloc runtime
+$(PA_BUILD):
 	@mkdir -p `dirname $@`
 	@echo "#!/bin/sh" > $@.tmp
-	@echo 'llvm-ld -link-as-library $$@ $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/libpoolalloc_rt.bca ' >> $@.tmp
+	@echo 'llc $$1 -o $$1.pa.S' >> $@.tmp
+	@echo 'clang $$1.pa.S -o $$2 -lpoolalloc_rt -L$(PROJ_OBJ_ROOT)/$(BuildMode)/lib' \
+		'-Wl,-rpath $(PROJ_OBJ_ROOT)/$(BuildMode)/lib' >> $@.tmp
 	@chmod +x $@.tmp
 	@mv $@.tmp $@
 

Modified: poolalloc/trunk/test/pa/regression/2010-09-14-Fptr.c
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/pa/regression/2010-09-14-Fptr.c?rev=156057&r1=156056&r2=156057&view=diff
==============================================================================
--- poolalloc/trunk/test/pa/regression/2010-09-14-Fptr.c (original)
+++ poolalloc/trunk/test/pa/regression/2010-09-14-Fptr.c Wed May  2 21:35:42 2012
@@ -2,9 +2,7 @@
  * Build this file into bitcode and run poolalloc on it
  * RUN: clang -O0 %s -emit-llvm -c -o %t.bc
  * RUN: paopt %t.bc -paheur-AllButUnreachableFromMemory -poolalloc -o %t.pa.bc 2>&1
- * RUN: pa-link %t.pa.bc -o %t.pa.ld.bc
- * RUN: llc %t.pa.ld.bc -o %t.pa.s
- * RUN: clang %t.pa.s -o %t.pa
+ * RUN: pa-build %t.pa.bc %t.pa
  *
  * Build the program without poolalloc:
  * RUN: clang -o %t.native %s

Modified: poolalloc/trunk/test/pa/regression/2010-09-14-Fptr_helper.c
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/pa/regression/2010-09-14-Fptr_helper.c?rev=156057&r1=156056&r2=156057&view=diff
==============================================================================
--- poolalloc/trunk/test/pa/regression/2010-09-14-Fptr_helper.c (original)
+++ poolalloc/trunk/test/pa/regression/2010-09-14-Fptr_helper.c Wed May  2 21:35:42 2012
@@ -5,9 +5,7 @@
  * Build this file into bitcode and run poolalloc on it
  * RUN: clang -O0 %s -emit-llvm -c -o %t.bc
  * RUN: paopt %t.bc -paheur-AllButUnreachableFromMemory -poolalloc -o %t.pa.bc 2>&1
- * RUN: pa-link %t.pa.bc -o %t.pa.ld.bc
- * RUN: llc %t.pa.ld.bc -o %t.pa.s
- * RUN: clang %t.pa.s -o %t.pa
+ * RUN: pa-build %t.pa.bc %t.pa
  *
  * Build the program without poolalloc:
  * RUN: clang -o %t.native %s