Skip to content

Commit d2c7ccb

Browse files
committed
---
yaml --- r: 174007 b: refs/heads/batch c: 1649810 h: refs/heads/master i: 174005: fb0e780 174003: 8eb0ef0 173999: df24d74 v: v3
1 parent b6d6eb1 commit d2c7ccb

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2929
refs/heads/issue-18208-method-dispatch-2: 9e1eae4fb9b6527315b4441cf8a0f5ca911d1671
3030
refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
32-
refs/heads/batch: f0d6eee499e898fc0336c72069ab7bac47125c4b
32+
refs/heads/batch: 164981042d6afd38c6635ab10ef8ed3c0daffe8b
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3434
refs/heads/beta: 44a287e6eb22ec3c2a687fc156813577464017f7
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

branches/batch/src/libstd/sys/common/stack.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,12 @@ pub unsafe fn record_sp_limit(limit: uint) {
231231
unsafe fn target_record_sp_limit(_: uint) {
232232
}
233233

234+
// powerpc - FIXME(POWERPC): missing...
235+
#[cfg(target_arch = "powerpc")]
236+
unsafe fn target_record_sp_limit(_: uint) {
237+
}
238+
239+
234240
// iOS segmented stack is disabled for now, see related notes
235241
#[cfg(all(target_arch = "arm", target_os = "ios"))] #[inline(always)]
236242
unsafe fn target_record_sp_limit(_: uint) {
@@ -326,6 +332,12 @@ pub unsafe fn get_sp_limit() -> uint {
326332
1024
327333
}
328334

335+
// powepc - FIXME(POWERPC): missing...
336+
#[cfg(target_arch = "powerpc")]
337+
unsafe fn target_get_sp_limit() -> uint {
338+
1024
339+
}
340+
329341
// iOS doesn't support segmented stacks yet. This function might
330342
// be called by runtime though so it is unsafe to mark it as
331343
// unreachable, let's return a fixed constant.

0 commit comments

Comments
 (0)