Skip to content

Commit 3f32750

Browse files
committed
---
yaml --- r: 85700 b: refs/heads/dist-snap c: 0ac02e7 h: refs/heads/master v: v3
1 parent f08ceb0 commit 3f32750

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 0983ebe5310d4eb6d289f636f7ed0536c08bbc0e
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: db14469e21facf6754e24aea5fbb5de7e0c03e99
9+
refs/heads/dist-snap: 0ac02e7c4fcdda35940eccba385001e8b882c63e
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/mk/platform.mk

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ endef
2626
$(foreach t,$(CFG_TARGET_TRIPLES),$(eval $(call DEF_OSTYPE_VAR,$(t))))
2727
$(foreach t,$(CFG_TARGET_TRIPLES),$(info cfg: os for $(t) is $(OSTYPE_$(t))))
2828

29-
# FIXME: no-omit-frame-pointer is just so that task_start_wrapper
30-
# has a frame pointer and the stack walker can understand it. Turning off
31-
# frame pointers everywhere is overkill
32-
CFG_GCCISH_CFLAGS += -fno-omit-frame-pointer -DUSE_UTF8
29+
CFG_GCCISH_CFLAGS += -DUSE_UTF8
3330

3431
# On Darwin, we need to run dsymutil so the debugging information ends
3532
# up in the right place. On other platforms, it automatically gets

branches/dist-snap/src/rustllvm/RustWrapper.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,6 @@ LLVMRustBuildJIT(void* mem,
342342
std::string Err;
343343
TargetOptions Options;
344344
Options.JITEmitDebugInfo = true;
345-
Options.NoFramePointerElim = true;
346345
Options.EnableSegmentedStacks = EnableSegmentedStacks;
347346
RustMCJITMemoryManager* MM = (RustMCJITMemoryManager*) mem;
348347
assert(MM);
@@ -393,7 +392,6 @@ LLVMRustWriteOutputFile(LLVMPassManagerRef PMR,
393392
}
394393

395394
TargetOptions Options;
396-
Options.NoFramePointerElim = true;
397395
Options.EnableSegmentedStacks = EnableSegmentedStacks;
398396
Options.FixedStackSegmentSize = 2 * 1024 * 1024; // XXX: This is too big.
399397

0 commit comments

Comments
 (0)