---

vhbit · vhbit · commit b90415442b2b · 2014-08-21T11:12:57.000+03:00
yaml --- r: 129023 b: refs/heads/auto c: 69fbef1 h: refs/heads/master i: 129021: 8c645c8 129019: ef26d69 129015: 81a8c22 129007: c1f621c 128991: 9736582 128959: 8712dfb 128895: 877d138 128767: 46a1fc7 128511: 8dd02d4 127999: 1d095ce 126975: 331ad03 v: v3
diff --git a/[refs] b/[refs]
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 08a34531111ce02e0db9c7deed291f65508593bd
+refs/heads/auto: 69fbef1d87ffc4807ff75676f30c7ea30bb11a96
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/librustrt/unwind.rs b/branches/auto/src/librustrt/unwind.rs
@@ -333,7 +333,10 @@ pub mod eabi {
             uw::_URC_HANDLER_FOUND // catch!
         }
         else { // cleanup phase
-            uw::_URC_INSTALL_CONTEXT
+            unsafe {
+                __gcc_personality_sj0(_version, actions, _exception_class, _ue_header,
+                                      _context)
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,10 @@ pub mod eabi {`
`333`	`333`	`uw::_URC_HANDLER_FOUND // catch!`
`334`	`334`	`}`
`335`	`335`	`else { // cleanup phase`
`336`		`- uw::_URC_INSTALL_CONTEXT`
	`336`	`+ unsafe {`
	`337`	`+ __gcc_personality_sj0(_version, actions, _exception_class, _ue_header,`
	`338`	`+ _context)`
	`339`	`+ }`
`337`	`340`	`}`
`338`	`341`	`}`
`339`	`342`	`}`