Construct annotation, to make sure it's attached to function

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index f3f3cf159ccf9f91a76f443758519734c4c3eaa6..b9b1cc5b9624249102aff4c497abae86e9891865 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -126,7 +126,7 @@ endif
 # Special tools used while building the LLVM tree.  Burg is built as part of the
 # utils directory.
 #
-BURG    := $(LEVEL)/utils/Burg/burg.$(UNAME)
+BURG    := $(TOOLDEBUG)/burg
 RunBurg := $(BURG) $(BURG_OPTS)
 
 
@@ -142,8 +142,10 @@ endif
 # By default, strip symbol information from executable
 ifdef KEEP_SYMBOLS
 STRIP =
+WARN_MSG =
 else
 STRIP = -s
+WARN_MSG = "(without symbols) "
 endif
 
 # Allow gnu extensions...
@@ -161,7 +163,7 @@ CompileP := $(CompileO) $(PROFILE)
 # Compile a c file, don't link...
 CompileC  := $(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CompileCommonOpts)
 CompileCG := $(CompileC) -g  -D_DEBUG
-CompileCO := $(CompileC) -O3 -DNDEBUG -finline-functions -felide-constructors -fshort-enums ## DISABLE -freg-struct-return because of gcc3.2 bug
+CompileCO := $(CompileC) -O3 -DNDEBUG -finline-functions -fshort-enums ## DISABLE -freg-struct-return because of gcc3.2 bug
 CompileCP := $(CompileCO) $(PROFILE)
 
 
@@ -397,12 +399,12 @@ clean::
        $(VERB) rm -f $(TOOLEXENAMES)
 
 $(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(BUILD_ROOT_TOP)/tools/Debug/.dir
-       @echo ======= Linking $(TOOLNAME) debug executable =======
+       @echo ======= Linking $(TOOLNAME) debug executable $(WARN_MSG) =======
        $(VERB) $(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS_G) $(TOOLLINKOPTS)
 
 $(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(BUILD_ROOT_TOP)/tools/Release/.dir
        @echo ======= Linking $(TOOLNAME) release executable =======
-       $(VERB) $(LinkO) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS_O) $(TOOLLINKOPTS)
+       $(VERB) $(LinkO) -o $@ $(ObjectsO) $(USED_LIBS_OPTIONS_O) $(TOOLLINKOPTS)
 
 $(TOOLEXENAME_P): $(ObjectsP) $(USED_LIB_PATHS_P) $(BUILD_ROOT_TOP)/tools/Profile/.dir
        @echo ======= Linking $(TOOLNAME) profile executable =======
@@ -430,7 +432,7 @@ $(BUILD_ROOT)/Release/%.o: %.cpp $(BUILD_ROOT)/Release/.dir
        $(VERB) $(CompileO) $< -o $@
 
 $(BUILD_ROOT)/Release/%.o: %.c $(BUILD_ROOT)/Release/.dir
-       $(VERB) $(CompileOC) $< -o $@
+       $(VERB) $(CompileCO) $< -o $@
 
 $(BUILD_ROOT)/Profile/%.o: %.cpp $(BUILD_ROOT)/Profile/.dir
        @echo "Compiling $<"
@@ -474,5 +476,5 @@ clean::
 #
 SourceDepend := $(addsuffix .d,$(addprefix $(BUILD_ROOT)/Depend/,$(basename $(filter-out Debug/%, $(Source)))))
 ifneq ($(SourceDepend),)
-include $(SourceDepend)
+-include $(SourceDepend)
 endif