Changes in directory llvm-test:
Makefile.programs updated: 1.213 -> 1.214
Makefile.rules updated: 1.11 -> 1.12
Makefile.tests updated: 1.7 -> 1.8
---
Log message:
Clean up makefiles.
---
Diffs of the changes: (+19 -16)
Makefile.programs | 10 +++-------
Makefile.rules | 17 ++++++++++++-----
Makefile.tests | 8 ++++----
3 files changed, 19 insertions(+), 16 deletions(-)
Index: llvm-test/Makefile.programs
diff -u llvm-test/Makefile.programs:1.213 llvm-test/Makefile.programs:1.214
--- llvm-test/Makefile.programs:1.213 Thu May 25 03:38:21 2006
+++ llvm-test/Makefile.programs Tue Jun 6 19:05:16 2006
@@ -203,10 +203,6 @@
LLCBETAOPTION := -enable-sparc-v9-insts
endif
-ifeq ($(OS),Darwin)
-TARGET_CFLAGS := -mdynamic-no-pic -fomit-frame-pointer
-endif
-
# Given a version of the entire program linked together into a single unit of
# raw output from the C frontend, optimize it.
$(PROGRAMS_TO_TEST:%=Output/%.linked.bc): \
@@ -282,7 +278,7 @@
$(PROGRAMS_TO_TEST:%=Output/%.cbe): \
Output/%.cbe: Output/%.cbe.c
- -$(CC) $< $(LDFLAGS) $(CFLAGS) -fno-strict-aliasing -O2
$(TARGET_CFLAGS) -o $@
+ -$(CC) $< $(LDFLAGS) $(CFLAGS) -fno-strict-aliasing -O2 $(TARGET_FLAGS)
-o $@
#
# Compile a linked program to machine code with LLC.
@@ -308,11 +304,11 @@
#
$(PROGRAMS_TO_TEST:%=Output/%.llc): \
Output/%.llc: Output/%.llc.s
- -$(CC) $(CFLAGS) $< $(LLCLIBS) $(LLCASSEMBLERFLAGS) $(LDFLAGS) -o $@
+ -$(CC) $(CFLAGS) $< $(LLCLIBS) $(LLCASSEMBLERFLAGS) $(TARGET_FLAGS)
$(LDFLAGS) -o $@
$(PROGRAMS_TO_TEST:%=Output/%.llc-beta): \
Output/%.llc-beta: Output/%.llc-beta.s
- -$(CC) $(CFLAGS) $< $(LLCLIBS) $(LLCASSEMBLERFLAGS) $(LDFLAGS) -o $@
+ -$(CC) $(CFLAGS) $< $(LLCLIBS) $(LLCASSEMBLERFLAGS) $(TARGET_FLAGS)
$(LDFLAGS) -o $@
#
Index: llvm-test/Makefile.rules
diff -u llvm-test/Makefile.rules:1.11 llvm-test/Makefile.rules:1.12
--- llvm-test/Makefile.rules:1.11 Sun Apr 9 15:43:17 2006
+++ llvm-test/Makefile.rules Tue Jun 6 19:05:16 2006
@@ -315,14 +315,21 @@
# Pull in limit macros from stdint.h, even in C++:
CPPFLAGS += -D__STDC_LIMIT_MACROS
-CompileCommonOpts :=
CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions
+ifeq ($(OS),Darwin)
+TARGET_FLAGS := -mdynamic-no-pic -fomit-frame-pointer
+endif
+
+ifdef EXTRA_FLAGS
+TARGET_FLAGS += $(EXTRA_FLAGS)
+endif
+
#
# Compile commands with libtool.
#
-Compile := $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c $(CPPFLAGS)
$(CXXFLAGS) $(CompileCommonOpts)
-CompileC := $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS)
$(CompileCommonOpts)
+Compile := $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c $(CPPFLAGS)
$(CXXFLAGS)
+CompileC := $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS)
# Compile a cpp file, don't link...
CompileG := $(Compile) -g -D_DEBUG
@@ -782,11 +789,11 @@
$(PROJ_OBJ_DIR)/BytecodeObj/%.bc: %.cpp $(PROJ_OBJ_DIR)/BytecodeObj/.dir
$(LCC1XX)
@${ECHO} "Compiling `basename $<` to bytecode"
- $(VERB) $(LLVMGXX) $(CompileCommonOpts) $(CPPFLAGS) -c $< -o $@
+ $(VERB) $(LLVMGXX) $(CPPFLAGS) -c $< -o $@
$(PROJ_OBJ_DIR)/BytecodeObj/%.bc: %.c $(PROJ_OBJ_DIR)/BytecodeObj/.dir $(LCC1)
@${ECHO} "Compiling `basename $<` to bytecode"
- $(VERB) $(LLVMGCC) $(CompileCommonOpts) $(CPPFLAGS) -c $< -o $@
+ $(VERB) $(LLVMGCC) $(CPPFLAGS) -c $< -o $@
$(PROJ_OBJ_DIR)/BytecodeObj/%.bc: %.ll $(PROJ_OBJ_DIR)/BytecodeObj/.dir
$(LLVMAS)
@${ECHO} "Compiling `basename $<` to bytecode"
Index: llvm-test/Makefile.tests
diff -u llvm-test/Makefile.tests:1.7 llvm-test/Makefile.tests:1.8
--- llvm-test/Makefile.tests:1.7 Mon Feb 27 16:09:31 2006
+++ llvm-test/Makefile.tests Tue Jun 6 19:05:16 2006
@@ -50,19 +50,19 @@
# Compile from X.c to Output/X.ll
Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
- -$(LLVMGCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ -emit-llvm
+ -$(LLVMGCC) $(CPPFLAGS) $(LCCFLAGS) $(TARGET_FLAGS) -S $< -o $@
-emit-llvm
# Compile from X.cpp to Output/X.ll
Output/%.ll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
- -$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ -emit-llvm
+ -$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) $(TARGET_FLAGS) -S $< -o $@
-emit-llvm
# Compile from X.cc to Output/X.ll
Output/%.ll: %.cc $(LCC1XX) Output/.dir $(INCLUDES)
- -$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ -emit-llvm
+ -$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) $(TARGET_FLAGS) -S $< -o $@
-emit-llvm
# Compile from X.C to Output/X.ll
Output/%.ll: %.C $(LCC1XX) Output/.dir $(INCLUDES)
- -$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ -emit-llvm
+ -$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) $(TARGET_FLAGS) -S $< -o $@
-emit-llvm
# LLVM Assemble from Output/X.ll to Output/X.bc. Output/X.ll must have come
# from GCC output, so use GCCAS.
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
