[llvm-commits] CVS: llvm/Makefile.common

[Vikram Adve]

Changes in directory llvm:

Makefile.common updated: 1.56 -> 1.57

---
Log message:

Fix link error for profile version.  Also, build Burg differently
for different architectures.


---
Diffs of the changes:

Index: llvm/Makefile.common
diff -u llvm/Makefile.common:1.56 llvm/Makefile.common:1.57
--- llvm/Makefile.common:1.56	Fri Sep 20 09:03:13 2002
+++ llvm/Makefile.common	Fri Sep 20 11:15:57 2002
@@ -126,7 +126,7 @@
 # Special tools used while building the LLVM tree.  Burg is built as part of the
 # utils directory.
 #
-BURG    := $(LEVEL)/utils/Burg/burg
+BURG    := $(LEVEL)/utils/Burg/burg.$(UNAME)
 RunBurg := $(BURG) $(BURG_OPTS)
 
 
@@ -167,7 +167,7 @@
 endif
 LinkG    := $(Link) -g  -L $(LIBDEBUG) $(STRIP)
 LinkO    := $(Link) -O3 -L $(LIBRELEASE)
-LinkP    := $(LinkO) $(PROFILE)
+LinkP    := $(Link) -O3 -L $(LIBPROFILE) $(PROFILE)
 
 # Create one .o file from a bunch of .o files...
 Relink = ld -r
@@ -358,9 +358,9 @@
   TOOLEXENAMES  := $(TOOLEXENAME_G)
 else
   ifdef ENABLE_PROFILING
-    TOOLEXENAMES := $(TOOLEXENAME_O)
-  else
     TOOLEXENAMES := $(TOOLEXENAME_P)
+  else
+    TOOLEXENAMES := $(TOOLEXENAME_O)
   endif
 endif