# HG changeset patch
# User Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
# Date 1217407291 -7200
# Node ID 657d37df25b0f027ceeb02a256eb0d6169b2201e
# Parent  74101be2a5535f4f64052053a7a724d2fa406434# Parent  6df6433fdb2512906ddeab52a28ff4e1d64bfde0
stupid merge ... :/

diff -r 74101be2a553 -r 657d37df25b0 LICENSE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/LICENSE	Wed Jul 30 10:41:31 2008 +0200
@@ -0,0 +1,37 @@
+LLVMDC is released under the "three-clause BSD" license reproduced below with 
+the following exceptions:
+
+The DMD frontend in dmd/* is originally written by Walter Bright and released
+under the artistic license (dmd/artistic.txt) or the GPL version 1 (dmd/gpl.txt).
+
+The files gen/asmstmt.cpp and gen/d-asm-i386.h were originally written by David
+Friedman for GDC and released under the artistic license (dmd/artistic.txt) or
+the GPL version 2 or later.
+
+
+-- "three-clause BSD" --
+Copyright (c) 2007-2008 LLVMDC Team.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this 
+      list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, this
+      list of conditions and the following disclaimer in the documentation and/or 
+      other materials provided with the distribution.
+    * Neither the name of the LLVMDC Team nor the names of its contributors may be 
+      used to endorse or promote products derived from this software without specific
+      prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff -r 74101be2a553 -r 657d37df25b0 bin/llvmdc.conf
--- a/bin/llvmdc.conf	Wed Jul 30 10:12:55 2008 +0200
+++ b/bin/llvmdc.conf	Wed Jul 30 10:41:31 2008 +0200
@@ -1,4 +1,4 @@
 
 [Environment]
 
-DFLAGS=-I%@P%/../tango -L-L%@P%/../lib -R%@P%/../lib
+DFLAGS=-I%@P%/../tango-llvmdc -I%@P%/../tango-llvmdc/lib/common -L-L%@P%/../lib -R%@P%/../lib
diff -r 74101be2a553 -r 657d37df25b0 bin/llvmdc.ini
--- a/bin/llvmdc.ini	Wed Jul 30 10:12:55 2008 +0200
+++ b/bin/llvmdc.ini	Wed Jul 30 10:41:31 2008 +0200
@@ -1,2 +1,13 @@
 [Environment]
+<<<<<<< local
+<<<<<<< local
+
+DFLAGS=-I%@P%/../tango-llvmdc -L-L%@P%/../lib -R%@P%/../lib
+=======
+=======
+>>>>>>> other
 DFLAGS=-I%@P%/../tango -R%@P%/../lib
+<<<<<<< local
+>>>>>>> other
+=======
+>>>>>>> other
diff -r 74101be2a553 -r 657d37df25b0 llvmdc-tango
--- a/llvmdc-tango	Wed Jul 30 10:12:55 2008 +0200
+++ b/llvmdc-tango	Wed Jul 30 10:41:31 2008 +0200
@@ -1,4 +1,4 @@
-profile=tango
+#profile=tango
 
 compiler=llvmdc
 inifile=llvmdc.conf
@@ -13,7 +13,7 @@
 noversion=GNU
 testversion=linux
 testversion=Unix
-version=Posix
+testversion=Posix
 testversion=Windows
 testversion=Win32
 testversion=Win64
@@ -29,6 +29,7 @@
 testversion=LittleEndian
 testversion=BigEndian
 testversion=LLVM64
+textversion=LLVM_X86_FP80
 
 
 [compile]
@@ -42,7 +43,7 @@
 
 
 [link]
-#oneatatime=yes
+oneatatime=yes
 cmd=llvmdc $i -of$o
 
 libdir=-L-L=$i
@@ -52,7 +53,7 @@
 
 [liblink]
 safe=yes
-#oneatatime=yes
+oneatatime=yes
 cmd=llvm-ar rsc $o $i
 
 libdir=-L=$i
@@ -61,8 +62,8 @@
 
 
 [postliblink]
-#cmd=ranlib $i
-
+#cmd=llvm-ranlib $i
+cmd=
 
 [shliblink]
 shlibs=no
diff -r 74101be2a553 -r 657d37df25b0 tests/mini/compile_asm1.d
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/mini/compile_asm1.d	Wed Jul 30 10:41:31 2008 +0200
@@ -0,0 +1,11 @@
+extern(C) int printf(char*, ...);
+void main()
+{
+    void* i;
+    asm
+    {
+        mov EAX, FS:4;
+        mov i, EAX;
+    }
+    printf("FS:4 = %p\n", i);
+}