diff options
| author | Dave Huseby <dhuseby@mozilla.com> | 2015-02-05 11:34:59 -0800 |
|---|---|---|
| committer | Dave Huseby <dhuseby@mozilla.com> | 2015-02-11 14:49:10 -0800 |
| commit | 2ece7a6831ed3cc034ff0526236c68d92b1b7510 (patch) | |
| tree | 212a371fe4a21da5bb0e03c0272bfbed2dd86e7f | |
| parent | 34590d6def06c5799c7f1f58b4097075a0c995bd (diff) | |
| download | rust-2ece7a6831ed3cc034ff0526236c68d92b1b7510.tar.gz rust-2ece7a6831ed3cc034ff0526236c68d92b1b7510.zip | |
PR review fixes
| -rw-r--r-- | mk/platform.mk | 18 | ||||
| -rw-r--r-- | src/libstd/sys/common/stack.rs | 14 |
2 files changed, 11 insertions, 21 deletions
diff --git a/mk/platform.mk b/mk/platform.mk index 3b172e87bda..ed50585822e 100644 --- a/mk/platform.mk +++ b/mk/platform.mk @@ -144,14 +144,14 @@ FIND_COMPILER = $(word 1,$(1:ccache=)) define CFG_MAKE_TOOLCHAIN # Prepend the tools with their prefix if cross compiling ifneq ($(CFG_BUILD),$(1)) - CC_$(1)=$(CROSS_PREFIX_$(1))$(CC_$(1)) - CXX_$(1)=$(CROSS_PREFIX_$(1))$(CXX_$(1)) - CPP_$(1)=$(CROSS_PREFIX_$(1))$(CPP_$(1)) - AR_$(1)=$(CROSS_PREFIX_$(1))$(AR_$(1)) - RUSTC_CROSS_FLAGS_$(1)=-C linker=$$(call FIND_COMPILER,$$(CC_$(1))) \ - -C ar=$$(call FIND_COMPILER,$$(AR_$(1))) $(RUSTC_CROSS_FLAGS_$(1)) - - RUSTC_FLAGS_$(1)=$$(RUSTC_CROSS_FLAGS_$(1)) $(RUSTC_FLAGS_$(1)) + CC_$(1)=$(CROSS_PREFIX_$(1))$(CC_$(1)) + CXX_$(1)=$(CROSS_PREFIX_$(1))$(CXX_$(1)) + CPP_$(1)=$(CROSS_PREFIX_$(1))$(CPP_$(1)) + AR_$(1)=$(CROSS_PREFIX_$(1))$(AR_$(1)) + RUSTC_CROSS_FLAGS_$(1)=-C linker=$$(call FIND_COMPILER,$$(CC_$(1))) \ + -C ar=$$(call FIND_COMPILER,$$(AR_$(1))) $(RUSTC_CROSS_FLAGS_$(1)) + + RUSTC_FLAGS_$(1)=$$(RUSTC_CROSS_FLAGS_$(1)) $(RUSTC_FLAGS_$(1)) endif CFG_COMPILE_C_$(1) = $$(CC_$(1)) \ @@ -200,7 +200,7 @@ define CFG_MAKE_TOOLCHAIN # For the ARM, AARCH64, MIPS and POWER crosses, use the toolchain assembler # FIXME: We should be able to use the LLVM assembler CFG_ASSEMBLE_$(1)=$$(CC_$(1)) $$(CFG_GCCISH_CFLAGS_$(1)) \ - $$(CFG_DEPEND_FLAGS) $$(2) -c -o $$(1) + $$(CFG_DEPEND_FLAGS) $$(2) -c -o $$(1) endif diff --git a/src/libstd/sys/common/stack.rs b/src/libstd/sys/common/stack.rs index bc4ea662318..5ebc851e194 100644 --- a/src/libstd/sys/common/stack.rs +++ b/src/libstd/sys/common/stack.rs @@ -195,12 +195,6 @@ pub unsafe fn record_sp_limit(limit: uint) { asm!("movq $0, %fs:32" :: "r"(limit) :: "volatile") } - #[cfg(target_os = "bitrig")] - #[inline(always)] - unsafe fn target_record_sp_limit(_: uint) { - // segmented stacks are disabled - } - // x86 #[cfg(all(target_arch = "x86", any(target_os = "macos", target_os = "ios")))] @@ -240,6 +234,7 @@ pub unsafe fn record_sp_limit(limit: uint) { #[cfg(any(target_arch = "aarch64", target_arch = "powerpc", all(target_arch = "arm", target_os = "ios"), + target_os = "bitrig", target_os = "openbsd"))] unsafe fn target_record_sp_limit(_: uint) { } @@ -290,12 +285,6 @@ pub unsafe fn get_sp_limit() -> uint { asm!("movq %fs:32, $0" : "=r"(limit) ::: "volatile"); return limit; } - #[cfg(target_os = "bitrig")] - #[inline(always)] - unsafe fn target_get_sp_limit() -> uint { - return 2048; - } - // x86 #[cfg(all(target_arch = "x86", @@ -344,6 +333,7 @@ pub unsafe fn get_sp_limit() -> uint { #[cfg(any(target_arch = "aarch64", target_arch = "powerpc", all(target_arch = "arm", target_os = "ios"), + target_os = "bitrig", target_os = "openbsd"))] #[inline(always)] unsafe fn target_get_sp_limit() -> uint { |