[llvm-branch-commits] [llvm-branch] r128259 - in /llvm/branches/release_29: ./ Makefile.rules lib/Support/raw_ostream.cpp test/CodeGen/X86/dyn-stackalloc.ll test/Makefile utils/llvm-lit/Makefile
Bill Wendling
isanbard at gmail.com
Thu Mar 24 23:26:59 PDT 2011
Author: void
Date: Fri Mar 25 01:26:58 2011
New Revision: 128259
URL: http://llvm.org/viewvc/llvm-project?rev=128259&view=rev
Log:
--- Merging r127239 into '.':
U test/Makefile
U Makefile.rules
--- Merging r127240 into '.':
U utils/llvm-lit/Makefile
--- Merging r127726 into '.':
U lib/Support/raw_ostream.cpp
--- Merging r127730 into '.':
U test/CodeGen/X86/dyn-stackalloc.ll
Modified:
llvm/branches/release_29/ (props changed)
llvm/branches/release_29/Makefile.rules
llvm/branches/release_29/lib/Support/raw_ostream.cpp
llvm/branches/release_29/test/CodeGen/X86/dyn-stackalloc.ll
llvm/branches/release_29/test/Makefile
llvm/branches/release_29/utils/llvm-lit/Makefile
Propchange: llvm/branches/release_29/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 25 01:26:58 2011
@@ -1,2 +1,2 @@
/llvm/branches/Apple/Pertwee:110850,110961
-/llvm/trunk:127241,127263-127264,127298,127325,127328,127350-127351,127441,127464,127723,127731-127734,127775,127780,127858,127871-127872,127981,128041,128100,128194-128197,128203,128212,128217
+/llvm/trunk:127239-127241,127263-127264,127298,127325,127328,127350-127351,127441,127464,127723,127726,127730-127734,127775,127780,127858,127871-127872,127981,128041,128100,128194-128197,128203,128212,128217
Modified: llvm/branches/release_29/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_29/Makefile.rules?rev=128259&r1=128258&r2=128259&view=diff
==============================================================================
--- llvm/branches/release_29/Makefile.rules (original)
+++ llvm/branches/release_29/Makefile.rules Fri Mar 25 01:26:58 2011
@@ -719,6 +719,24 @@
ObjectsO := $(BaseNameSources:%=$(ObjDir)/%.o)
ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc)
+#----------------------------------------------------------
+# For Mingw MSYS bash and Python/w32:
+#
+# $(ECHOPATH) prints DOSish pathstring.
+# ex) $(ECHOPATH) /include/sys/types.h
+# --> C:/mingw/include/sys/types.h
+# built-in "echo" does not transform path to DOSish path.
+#
+# FIXME: It would not be needed when MSYS's python
+# were provided.
+#----------------------------------------------------------
+
+ifeq (-mingw32,$(findstring -mingw32,$(BUILD_TRIPLE)))
+ ECHOPATH := $(Verb)python -u -c "import sys;print ' '.join(sys.argv[1:])"
+else
+ ECHOPATH := $(Verb)$(ECHO)
+endif
+
###############################################################################
# DIRECTORIES: Handle recursive descent of directory structure
###############################################################################
Modified: llvm/branches/release_29/lib/Support/raw_ostream.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_29/lib/Support/raw_ostream.cpp?rev=128259&r1=128258&r2=128259&view=diff
==============================================================================
--- llvm/branches/release_29/lib/Support/raw_ostream.cpp (original)
+++ llvm/branches/release_29/lib/Support/raw_ostream.cpp Fri Mar 25 01:26:58 2011
@@ -496,6 +496,14 @@
}
}
+#ifdef __MINGW32__
+ // On mingw, global dtors should not call exit().
+ // report_fatal_error() invokes exit(). We know report_fatal_error()
+ // might not write messages to stderr when any errors were detected
+ // on FD == 2.
+ if (FD == 2) return;
+#endif
+
// If there are any pending errors, report them now. Clients wishing
// to avoid report_fatal_error calls should check for errors with
// has_error() and clear the error flag with clear_error() before
Modified: llvm/branches/release_29/test/CodeGen/X86/dyn-stackalloc.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_29/test/CodeGen/X86/dyn-stackalloc.ll?rev=128259&r1=128258&r2=128259&view=diff
==============================================================================
--- llvm/branches/release_29/test/CodeGen/X86/dyn-stackalloc.ll (original)
+++ llvm/branches/release_29/test/CodeGen/X86/dyn-stackalloc.ll Fri Mar 25 01:26:58 2011
@@ -1,6 +1,9 @@
-; RUN: llc < %s -mtriple=i686-linux | not egrep {\\\$4294967289|-7}
-; RUN: llc < %s -mtriple=i686-linux | egrep {\\\$4294967280|-16}
-; RUN: llc < %s -mtriple=x86_64-linux | grep {\\-16}
+; RUN: llc < %s -mtriple=i686-linux | FileCheck %s -check-prefix=X32
+; X32-NOT: {{$429496728|-7}}
+; X32: {{$4294967280|-16}}
+; X32-NOT: {{$429496728|-7}}
+; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s -check-prefix=X64
+; X64: -16
define void @t() nounwind {
A:
Modified: llvm/branches/release_29/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_29/test/Makefile?rev=128259&r1=128258&r2=128259&view=diff
==============================================================================
--- llvm/branches/release_29/test/Makefile (original)
+++ llvm/branches/release_29/test/Makefile Fri Mar 25 01:26:58 2011
@@ -173,22 +173,24 @@
lit.site.cfg: site.exp
@echo "Making LLVM 'lit.site.cfg' file..."
- @sed -e "s#@LLVM_SOURCE_DIR@#$(LLVM_SRC_ROOT)#g" \
- -e "s#@LLVM_BINARY_DIR@#$(LLVM_OBJ_ROOT)#g" \
- -e "s#@LLVM_TOOLS_DIR@#$(ToolDir)#g" \
- -e "s#@LLVMGCCDIR@#$(LLVMGCCDIR)#g" \
- -e "s#@ENABLE_SHARED@#$(ENABLE_SHARED)#g" \
- $(PROJ_SRC_DIR)/lit.site.cfg.in > $@
+ @$(ECHOPATH) s=@LLVM_SOURCE_DIR@=$(LLVM_SRC_ROOT)=g > lit.tmp
+ @$(ECHOPATH) s=@LLVM_BINARY_DIR@=$(LLVM_OBJ_ROOT)=g >> lit.tmp
+ @$(ECHOPATH) s=@LLVM_TOOLS_DIR@=$(ToolDir)=g >> lit.tmp
+ @$(ECHOPATH) s=@LLVMGCCDIR@=$(LLVMGCCDIR)=g >> lit.tmp
+ @$(ECHOPATH) s=@PYTHON_EXECUTABLE@=python=g >> lit.tmp
+ @$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> lit.tmp
+ @sed -f lit.tmp $(PROJ_SRC_DIR)/lit.site.cfg.in > $@
+ @-rm -f lit.tmp
Unit/lit.site.cfg: $(PROJ_OBJ_DIR)/Unit/.dir FORCE
@echo "Making LLVM unittest 'lit.site.cfg' file..."
- @sed -e "s#@LLVM_SOURCE_DIR@#$(LLVM_SRC_ROOT)#g" \
- -e "s#@LLVM_BINARY_DIR@#$(LLVM_OBJ_ROOT)#g" \
- -e "s#@LLVM_TOOLS_DIR@#$(ToolDir)#g" \
- -e "s#@LLVMGCCDIR@#$(LLVMGCCDIR)#g" \
- -e "s#@LLVM_BUILD_MODE@#$(BuildMode)#g" \
- -e "s#@ENABLE_SHARED@#$(ENABLE_SHARED)#g" \
- -e "s#@SHLIBDIR@#$(SharedLibDir)#g" \
- -e "s#@SHLIBPATH_VAR@#$(SHLIBPATH_VAR)#g" \
- $(PROJ_SRC_DIR)/Unit/lit.site.cfg.in > $@
-
+ @$(ECHOPATH) s=@LLVM_SOURCE_DIR@=$(LLVM_SRC_ROOT)=g > unit.tmp
+ @$(ECHOPATH) s=@LLVM_BINARY_DIR@=$(LLVM_OBJ_ROOT)=g >> unit.tmp
+ @$(ECHOPATH) s=@LLVM_TOOLS_DIR@=$(ToolDir)=g >> unit.tmp
+ @$(ECHOPATH) s=@LLVMGCCDIR@=$(LLVMGCCDIR)=g >> unit.tmp
+ @$(ECHOPATH) s=@LLVM_BUILD_MODE@=$(BuildMode)=g >> unit.tmp
+ @$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> unit.tmp
+ @$(ECHOPATH) s=@SHLIBDIR@=$(SharedLibDir)=g >> unit.tmp
+ @$(ECHOPATH) s=@SHLIBPATH_VAR@=$(SHLIBPATH_VAR)=g >> unit.tmp
+ @sed -f unit.tmp $(PROJ_SRC_DIR)/Unit/lit.site.cfg.in > $@
+ @-rm -f unit.tmp
Modified: llvm/branches/release_29/utils/llvm-lit/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_29/utils/llvm-lit/Makefile?rev=128259&r1=128258&r2=128259&view=diff
==============================================================================
--- llvm/branches/release_29/utils/llvm-lit/Makefile (original)
+++ llvm/branches/release_29/utils/llvm-lit/Makefile Fri Mar 25 01:26:58 2011
@@ -13,9 +13,10 @@
all:: $(ToolDir)/llvm-lit
-$(ToolDir)/llvm-lit: llvm-lit.in $(ToolDir)/.dir
+$(ToolDir)/llvm-lit: llvm-lit.in Makefile $(ToolDir)/.dir
$(Echo) "Creating 'llvm-lit' script..."
- $(Verb)sed -e "s#@LLVM_SOURCE_DIR@#$(LLVM_SRC_ROOT)#g" \
- -e "s#@LLVM_BINARY_DIR@#$(LLVM_OBJ_ROOT)#g" \
- $< > $@
+ $(Verb)$(ECHOPATH) s=@LLVM_SOURCE_DIR@=$(LLVM_SRC_ROOT)=g > lit.tmp
+ $(Verb)$(ECHOPATH) s=@LLVM_BINARY_DIR@=$(LLVM_OBJ_ROOT)=g >> lit.tmp
+ $(Verb)sed -f lit.tmp $< > $@
$(Verb)chmod +x $@
+ $(Verb)rm -f lit.tmp
More information about the llvm-branch-commits
mailing list