[llvm-commits] [dragonegg] r110910 - in /dragonegg/trunk: Makefile utils/target.cpp
Duncan Sands
baldrick at free.fr
Thu Aug 12 04:36:08 PDT 2010
Author: baldrick
Date: Thu Aug 12 06:36:08 2010
New Revision: 110910
URL: http://llvm.org/viewvc/llvm-project?rev=110910&view=rev
Log:
Normalize the triple provided when configuring gcc before using
it. This fixes the dragonegg build when gcc is configured with
(for example) x86_64-linux-gnu rather than x86_64-pc-linux-gnu.
The problem was that the triple class would not understand that
the O/S was linux in the first case.
Modified:
dragonegg/trunk/Makefile
dragonegg/trunk/utils/target.cpp
Modified: dragonegg/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/Makefile?rev=110910&r1=110909&r2=110910&view=diff
==============================================================================
--- dragonegg/trunk/Makefile (original)
+++ dragonegg/trunk/Makefile Thu Aug 12 06:36:08 2010
@@ -51,13 +51,13 @@
-MD -MP \
-DIN_GCC -DREVISION=\"$(REVISION)\" \
-DGCC_MAJOR=$(GCC_MAJOR) -DGCC_MINOR=$(GCC_MINOR) \
- -DTARGET_NAME=\"$(TARGET_TRIPLE)\" \
-I$(SRC_DIR) -I$(GCC_PLUGIN_DIR)/include
LD_OPTIONS+=$(LDFLAGS) $(shell $(LLVM_CONFIG) --ldflags)
# NOTE: The following flags can only be used after TARGET_UTIL has been built.
-TARGET_HEADERS+=-I$(SRC_DIR)/$(shell $(TARGET_UTIL) -p) \
+TARGET_HEADERS+=-DTARGET_NAME=\"$(shell $(TARGET_UTIL) -t)\" \
+ -I$(SRC_DIR)/$(shell $(TARGET_UTIL) -p) \
-I$(SRC_DIR)/$(shell $(TARGET_UTIL) -o)
@@ -65,7 +65,8 @@
$(TARGET_UTIL_OBJECTS): %.o : $(SRC_DIR)/utils/%.cpp
@echo Compiling utils/$*.cpp
- $(QUIET)$(CXX) -c $(CPP_OPTIONS) $(CXXFLAGS) $<
+ $(QUIET)$(CXX) -c -DTARGET_TRIPLE=\"$(TARGET_TRIPLE)\" \
+ $(CPP_OPTIONS) $(CXXFLAGS) $<
$(TARGET_UTIL): $(TARGET_UTIL_OBJECTS)
@echo Linking $@
@@ -83,7 +84,7 @@
$(TARGET_OBJECT): $(TARGET_UTIL)
@echo Compiling $(shell $(TARGET_UTIL) -p)/llvm-target.cpp
$(QUIET)$(CXX) -o $@ -c $(CPP_OPTIONS) $(TARGET_HEADERS) $(CXXFLAGS) \
- $(TARGET_SOURCE)
+ $(TARGET_SOURCE)
$(PLUGIN): $(PLUGIN_OBJECTS) $(TARGET_OBJECT) $(TARGET_UTIL)
@echo Linking $@
Modified: dragonegg/trunk/utils/target.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/utils/target.cpp?rev=110910&r1=110909&r2=110910&view=diff
==============================================================================
--- dragonegg/trunk/utils/target.cpp (original)
+++ dragonegg/trunk/utils/target.cpp Thu Aug 12 06:36:08 2010
@@ -36,7 +36,7 @@
};
int main(int argc, char **argv) {
- Triple T(TARGET_NAME);
+ Triple T(Triple::normalize(TARGET_TRIPLE));
for (int i = 1; i < argc; ++i) {
bool Found = false;
More information about the llvm-commits
mailing list