diff --git a/src/codegen.cpp b/src/codegen.cpp
index a336beb11f..66d3e35246 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -1772,9 +1772,10 @@ static LLVMValueRef ir_render_asm(CodeGen *g, IrExecutable *executable, IrInstru
     }
     LLVMTypeRef function_type = LLVMFunctionType(ret_type, param_types, input_and_output_count, false);
 
+    bool is_x86 = (g->zig_target.arch.arch == ZigLLVM_x86 || g->zig_target.arch.arch == ZigLLVM_x86_64);
     bool is_volatile = asm_expr->is_volatile || (asm_expr->output_list.length == 0);
-    LLVMValueRef asm_fn = LLVMConstInlineAsm(function_type, buf_ptr(&llvm_template),
-            buf_ptr(&constraint_buf), is_volatile, false);
+    LLVMValueRef asm_fn = ZigLLVMConstInlineAsm(function_type, buf_ptr(&llvm_template),
+            buf_ptr(&constraint_buf), is_volatile, false, is_x86);
 
     return LLVMBuildCall(g->builder, asm_fn, param_values, input_and_output_count, "");
 }
diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp
index a837c896cc..d946426b54 100644
--- a/src/zig_llvm.cpp
+++ b/src/zig_llvm.cpp
@@ -22,22 +22,23 @@
  * 3. Prevent C++ from infecting the rest of the project.
  */
 
-#include <llvm/InitializePasses.h>
-#include <llvm/PassRegistry.h>
-#include <llvm/MC/SubtargetFeature.h>
-#include <llvm/Support/raw_ostream.h>
-#include <llvm/Support/FileSystem.h>
-#include <llvm/Support/TargetParser.h>
-#include <llvm/Target/TargetMachine.h>
+#include <llvm/Analysis/TargetLibraryInfo.h>
+#include <llvm/Analysis/TargetTransformInfo.h>
+#include <llvm/IR/DIBuilder.h>
+#include <llvm/IR/DiagnosticInfo.h>
+#include <llvm/IR/IRBuilder.h>
+#include <llvm/IR/InlineAsm.h>
+#include <llvm/IR/Instructions.h>
 #include <llvm/IR/LegacyPassManager.h>
 #include <llvm/IR/Module.h>
 #include <llvm/IR/Verifier.h>
-#include <llvm/IR/Instructions.h>
-#include <llvm/IR/IRBuilder.h>
-#include <llvm/IR/DIBuilder.h>
-#include <llvm/IR/DiagnosticInfo.h>
-#include <llvm/Analysis/TargetLibraryInfo.h>
-#include <llvm/Analysis/TargetTransformInfo.h>
+#include <llvm/InitializePasses.h>
+#include <llvm/MC/SubtargetFeature.h>
+#include <llvm/PassRegistry.h>
+#include <llvm/Support/FileSystem.h>
+#include <llvm/Support/TargetParser.h>
+#include <llvm/Support/raw_ostream.h>
+#include <llvm/Target/TargetMachine.h>
 #include <llvm/Transforms/IPO.h>
 #include <llvm/Transforms/IPO/PassManagerBuilder.h>
 #include <llvm/Transforms/Scalar.h>
@@ -139,6 +140,18 @@ LLVMValueRef ZigLLVMBuildCall(LLVMBuilderRef B, LLVMValueRef Fn, LLVMValueRef *A
     return wrap(unwrap(B)->Insert(call_inst));
 }
 
+LLVMValueRef ZigLLVMConstInlineAsm(LLVMTypeRef Ty, const char *AsmString,
+        const char *Constraints, bool HasSideEffects, bool IsAlignStack, bool is_x86)
+{
+    if (is_x86) {
+        return wrap(InlineAsm::get(dyn_cast<FunctionType>(unwrap(Ty)), AsmString,
+                                Constraints, HasSideEffects, IsAlignStack, InlineAsm::AD_Intel));
+    } else {
+        return wrap(InlineAsm::get(dyn_cast<FunctionType>(unwrap(Ty)), AsmString,
+                                Constraints, HasSideEffects, IsAlignStack));
+    }
+}
+
 void ZigLLVMFnSetSubprogram(LLVMValueRef fn, ZigLLVMDISubprogram *subprogram) {
     assert( isa<Function>(unwrap(fn)) );
     Function *unwrapped_function = reinterpret_cast<Function*>(unwrap(fn));
diff --git a/src/zig_llvm.hpp b/src/zig_llvm.hpp
index b242cfac35..684b0ed301 100644
--- a/src/zig_llvm.hpp
+++ b/src/zig_llvm.hpp
@@ -39,6 +39,9 @@ void ZigLLVMOptimizeModule(LLVMTargetMachineRef targ_machine_ref, LLVMModuleRef
 LLVMValueRef ZigLLVMBuildCall(LLVMBuilderRef B, LLVMValueRef Fn, LLVMValueRef *Args,
         unsigned NumArgs, unsigned CC, const char *Name);
 
+LLVMValueRef ZigLLVMConstInlineAsm(LLVMTypeRef Ty, const char *AsmString,
+        const char *Constraints, bool HasSideEffects, bool IsAlignStack, bool is_x86);
+
 LLVMValueRef ZigLLVMBuildCmpXchg(LLVMBuilderRef builder, LLVMValueRef ptr, LLVMValueRef cmp,
         LLVMValueRef new_val, LLVMAtomicOrdering success_ordering,
         LLVMAtomicOrdering failure_ordering);
diff --git a/std/bootstrap.zig b/std/bootstrap.zig
index b490989a4d..8a901419dd 100644
--- a/std/bootstrap.zig
+++ b/std/bootstrap.zig
@@ -24,12 +24,12 @@ export nakedcc fn _start() -> unreachable {
 
     switch (@compileVar("arch")) {
         Arch.x86_64 => {
-            argc = asm("mov (%%rsp), %[argc]": [argc] "=r" (-> usize));
-            argv = asm("lea 0x8(%%rsp), %[argv]": [argv] "=r" (-> &&u8));
+            argc = asm("mov %[argc], [rsp]": [argc] "=r" (-> usize));
+            argv = asm("lea %[argv], [rsp + 8h]": [argv] "=r" (-> &&u8));
         },
         Arch.i386 => {
-            argc = asm("mov (%%esp), %[argc]": [argc] "=r" (-> usize));
-            argv = asm("lea 0x4(%%esp), %[argv]": [argv] "=r" (-> &&u8));
+            argc = asm("mov %[argc], [esp]": [argc] "=r" (-> usize));
+            argv = asm("lea %[argv], [esp + 4h]": [argv] "=r" (-> &&u8));
         },
         else => @compileError("unsupported arch"),
     }
diff --git a/std/linux_i386.zig b/std/linux_i386.zig
index d76d614a36..218043307e 100644
--- a/std/linux_i386.zig
+++ b/std/linux_i386.zig
@@ -420,20 +420,20 @@ pub const F_GETOWN_EX = 16;
 pub const F_GETOWNER_UIDS = 17;
 
 pub inline fn syscall0(number: usize) -> usize {
-    asm volatile ("int $0x80"
+    asm volatile ("int 80h"
         : [ret] "={eax}" (-> usize)
         : [number] "{eax}" (number))
 }
 
 pub inline fn syscall1(number: usize, arg1: usize) -> usize {
-    asm volatile ("int $0x80"
+    asm volatile ("int 80h"
         : [ret] "={eax}" (-> usize)
         : [number] "{eax}" (number),
             [arg1] "{ebx}" (arg1))
 }
 
 pub inline fn syscall2(number: usize, arg1: usize, arg2: usize) -> usize {
-    asm volatile ("int $0x80"
+    asm volatile ("int 80h"
         : [ret] "={eax}" (-> usize)
         : [number] "{eax}" (number),
             [arg1] "{ebx}" (arg1),
@@ -441,7 +441,7 @@ pub inline fn syscall2(number: usize, arg1: usize, arg2: usize) -> usize {
 }
 
 pub inline fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) -> usize {
-    asm volatile ("int $0x80"
+    asm volatile ("int 80h"
         : [ret] "={eax}" (-> usize)
         : [number] "{eax}" (number),
             [arg1] "{ebx}" (arg1),
@@ -450,7 +450,7 @@ pub inline fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) ->
 }
 
 pub inline fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize) -> usize {
-    asm volatile ("int $0x80"
+    asm volatile ("int 80h"
         : [ret] "={eax}" (-> usize)
         : [number] "{eax}" (number),
             [arg1] "{ebx}" (arg1),
@@ -462,7 +462,7 @@ pub inline fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg
 pub inline fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize,
     arg4: usize, arg5: usize) -> usize
 {
-    asm volatile ("int $0x80"
+    asm volatile ("int 80h"
         : [ret] "={eax}" (-> usize)
         : [number] "{eax}" (number),
             [arg1] "{ebx}" (arg1),
@@ -475,7 +475,7 @@ pub inline fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize,
 pub inline fn syscall6(number: usize, arg1: usize, arg2: usize, arg3: usize,
     arg4: usize, arg5: usize, arg6: usize) -> usize
 {
-    asm volatile ("int $0x80"
+    asm volatile ("int 80h"
         : [ret] "={eax}" (-> usize)
         : [number] "{eax}" (number),
             [arg1] "{ebx}" (arg1),