Use libinstr.$(ARCH).a instead of libinstr64.a

Also, $(RM) needs -f flag.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7128 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 3d66f17b32ada1d4fe7c265f034fba34a423c28b..c4e7090687b882f035bd6b82d663b9990566a795 100644 (file)
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -75,14 +75,14 @@ else
     endif
 endif
 ifeq ($(DOTRACING), yes)
-    TRACELIBS := -L$(LEVEL)/test/Libraries/Output -linstr64
+    TRACELIBS := -L$(LEVEL)/test/Libraries/Output -linstr.$(ARCH)
 endif
 
 
 LLCLIBS := $(LLCLIBS) -lm
 
 clean::
-       $(RM) a.out core
+       $(RM) -f a.out core
        $(RM) -rf Output/
 
 # Compile from X.c to Output/X.ll