---

yaml
---
r: 49104
b: refs/heads/snap-stage3
c: 778f845
h: refs/heads/master
v: v3

Author: luqmana

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: b867fe41defd95d839c96e2b746d1c7560fd338f
+refs/heads/snap-stage3: 778f84524b5e99b39748f89f87e1a5e90d13e6a6
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/asm.rs

@@ -84,11 +84,18 @@ pub fn trans_inline_asm(bcx: block, ia: &ast::inline_asm) -> block {
 
     let mut constraints = str::connect(constraints, ",");
 
+    let mut clobbers = getClobbers();
+    if *ia.clobbers != ~"" && clobbers != ~"" {
+        clobbers = *ia.clobbers + ~"," + clobbers;
+    } else {
+        clobbers += *ia.clobbers;
+    };
+
     // Add the clobbers to our constraints list
-    if *ia.clobbers != ~"" && constraints != ~"" {
-        constraints += ~"," + *ia.clobbers;
+    if clobbers != ~"" && constraints != ~"" {
+        constraints += ~"," + clobbers;
     } else {
-        constraints += *ia.clobbers;
+        constraints += clobbers;
     }
 
     debug!("Asm Constraints: %?", constraints);
@@ -131,3 +138,18 @@ pub fn trans_inline_asm(bcx: block, ia: &ast::inline_asm) -> block {
     return bcx;
 
 }
+
+// Default per-arch clobbers
+// Basically what clang does
+
+#[cfg(target_arch = "arm")]
+#[cfg(target_arch = "mips")]
+fn getClobbers() -> ~str {
+    ~""
+}
+
+#[cfg(target_arch = "x86")]
+#[cfg(target_arch = "x86_64")]
+fn getClobbers() -> ~str {
+    ~"~{dirflag},~{fpsr},~{flags}"
+}