# HG changeset patch
# User Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
# Date 1219685787 -7200
# Node ID 406aee3416bb8a20e6de7a7762e59ba2367e1368
# Parent  a426104603081d5ac09588525a4e151a47490514
Removed D_InlineAsm and D_InlineAsm_X86 versions.
Made use of 'naked' in inline asm an error.

diff -r a42610460308 -r 406aee3416bb dmd/mars.c
--- a/dmd/mars.c	Sun Aug 24 18:25:45 2008 +0200
+++ b/dmd/mars.c	Mon Aug 25 19:36:27 2008 +0200
@@ -68,7 +68,7 @@
 
     copyright = "Copyright (c) 1999-2008 by Digital Mars and Tomas Lindquist Olsen";
     written = "written by Walter Bright and Tomas Lindquist Olsen";
-    version = "v1.033";
+    version = "v1.034";
     llvmdc_version = "0.1";
     global.structalign = 8;
 
@@ -156,7 +156,7 @@
 
 void usage()
 {
-    printf("LLVM D Compiler %s (based on DMD %s and LLVM 2.3)\n%s\n%s\n",
+    printf("LLVM D Compiler %s (based on DMD %s and LLVM 2.4svn)\n%s\n%s\n",
     global.llvmdc_version, global.version, global.copyright, global.written);
     printf("\
 D Language Documentation: http://www.digitalmars.com/d/1.0/index.html\n\
@@ -693,8 +693,7 @@
         global.params.tt_arch = "i686";
         global.params.data_layout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-f80:32:32-v64:64:64-v128:128:128-a0:0:64";
         if (global.params.useInlineAsm) {
-            VersionCondition::addPredefinedGlobalIdent("D_InlineAsm");
-            VersionCondition::addPredefinedGlobalIdent("D_InlineAsm_X86");
+            VersionCondition::addPredefinedGlobalIdent("LLVM_InlineAsm_X86");
         }
     }
     else if (strcmp(global.params.llvmArch,"x86-64")==0) {
diff -r a42610460308 -r 406aee3416bb gen/functions.cpp
--- a/gen/functions.cpp	Sun Aug 24 18:25:45 2008 +0200
+++ b/gen/functions.cpp	Mon Aug 25 19:36:27 2008 +0200
@@ -538,10 +538,11 @@
     Logger::println("DtoDefineFunc(%s): %s", fd->toPrettyChars(), fd->loc.toChars());
     LOG_SCOPE;
 
-    // warn about naked
+    // error on naked
     if (fd->naked)
     {
-        warning("%s: naked is currently ignored", fd->locToChars());
+        fd->error("naked is not supported");
+        fatal();
     }
 
     // debug info