mirror of
https://github.com/rust-lang/rust
synced 2024-09-15 22:50:55 +00:00
PR review fixes
This commit is contained in:
parent
34590d6def
commit
2ece7a6831
|
@ -144,14 +144,14 @@ FIND_COMPILER = $(word 1,$(1:ccache=))
|
||||||
define CFG_MAKE_TOOLCHAIN
|
define CFG_MAKE_TOOLCHAIN
|
||||||
# Prepend the tools with their prefix if cross compiling
|
# Prepend the tools with their prefix if cross compiling
|
||||||
ifneq ($(CFG_BUILD),$(1))
|
ifneq ($(CFG_BUILD),$(1))
|
||||||
CC_$(1)=$(CROSS_PREFIX_$(1))$(CC_$(1))
|
CC_$(1)=$(CROSS_PREFIX_$(1))$(CC_$(1))
|
||||||
CXX_$(1)=$(CROSS_PREFIX_$(1))$(CXX_$(1))
|
CXX_$(1)=$(CROSS_PREFIX_$(1))$(CXX_$(1))
|
||||||
CPP_$(1)=$(CROSS_PREFIX_$(1))$(CPP_$(1))
|
CPP_$(1)=$(CROSS_PREFIX_$(1))$(CPP_$(1))
|
||||||
AR_$(1)=$(CROSS_PREFIX_$(1))$(AR_$(1))
|
AR_$(1)=$(CROSS_PREFIX_$(1))$(AR_$(1))
|
||||||
RUSTC_CROSS_FLAGS_$(1)=-C linker=$$(call FIND_COMPILER,$$(CC_$(1))) \
|
RUSTC_CROSS_FLAGS_$(1)=-C linker=$$(call FIND_COMPILER,$$(CC_$(1))) \
|
||||||
-C ar=$$(call FIND_COMPILER,$$(AR_$(1))) $(RUSTC_CROSS_FLAGS_$(1))
|
-C ar=$$(call FIND_COMPILER,$$(AR_$(1))) $(RUSTC_CROSS_FLAGS_$(1))
|
||||||
|
|
||||||
RUSTC_FLAGS_$(1)=$$(RUSTC_CROSS_FLAGS_$(1)) $(RUSTC_FLAGS_$(1))
|
RUSTC_FLAGS_$(1)=$$(RUSTC_CROSS_FLAGS_$(1)) $(RUSTC_FLAGS_$(1))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CFG_COMPILE_C_$(1) = $$(CC_$(1)) \
|
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
|
# For the ARM, AARCH64, MIPS and POWER crosses, use the toolchain assembler
|
||||||
# FIXME: We should be able to use the LLVM assembler
|
# FIXME: We should be able to use the LLVM assembler
|
||||||
CFG_ASSEMBLE_$(1)=$$(CC_$(1)) $$(CFG_GCCISH_CFLAGS_$(1)) \
|
CFG_ASSEMBLE_$(1)=$$(CC_$(1)) $$(CFG_GCCISH_CFLAGS_$(1)) \
|
||||||
$$(CFG_DEPEND_FLAGS) $$(2) -c -o $$(1)
|
$$(CFG_DEPEND_FLAGS) $$(2) -c -o $$(1)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -195,12 +195,6 @@ unsafe fn target_record_sp_limit(limit: uint) {
|
||||||
asm!("movq $0, %fs:32" :: "r"(limit) :: "volatile")
|
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
|
// x86
|
||||||
#[cfg(all(target_arch = "x86",
|
#[cfg(all(target_arch = "x86",
|
||||||
any(target_os = "macos", target_os = "ios")))]
|
any(target_os = "macos", target_os = "ios")))]
|
||||||
|
@ -240,6 +234,7 @@ unsafe fn target_record_sp_limit(limit: uint) {
|
||||||
#[cfg(any(target_arch = "aarch64",
|
#[cfg(any(target_arch = "aarch64",
|
||||||
target_arch = "powerpc",
|
target_arch = "powerpc",
|
||||||
all(target_arch = "arm", target_os = "ios"),
|
all(target_arch = "arm", target_os = "ios"),
|
||||||
|
target_os = "bitrig",
|
||||||
target_os = "openbsd"))]
|
target_os = "openbsd"))]
|
||||||
unsafe fn target_record_sp_limit(_: uint) {
|
unsafe fn target_record_sp_limit(_: uint) {
|
||||||
}
|
}
|
||||||
|
@ -290,12 +285,6 @@ unsafe fn target_get_sp_limit() -> uint {
|
||||||
asm!("movq %fs:32, $0" : "=r"(limit) ::: "volatile");
|
asm!("movq %fs:32, $0" : "=r"(limit) ::: "volatile");
|
||||||
return limit;
|
return limit;
|
||||||
}
|
}
|
||||||
#[cfg(target_os = "bitrig")]
|
|
||||||
#[inline(always)]
|
|
||||||
unsafe fn target_get_sp_limit() -> uint {
|
|
||||||
return 2048;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// x86
|
// x86
|
||||||
#[cfg(all(target_arch = "x86",
|
#[cfg(all(target_arch = "x86",
|
||||||
|
@ -344,6 +333,7 @@ unsafe fn target_get_sp_limit() -> uint {
|
||||||
#[cfg(any(target_arch = "aarch64",
|
#[cfg(any(target_arch = "aarch64",
|
||||||
target_arch = "powerpc",
|
target_arch = "powerpc",
|
||||||
all(target_arch = "arm", target_os = "ios"),
|
all(target_arch = "arm", target_os = "ios"),
|
||||||
|
target_os = "bitrig",
|
||||||
target_os = "openbsd"))]
|
target_os = "openbsd"))]
|
||||||
#[inline(always)]
|
#[inline(always)]
|
||||||
unsafe fn target_get_sp_limit() -> uint {
|
unsafe fn target_get_sp_limit() -> uint {
|
||||||
|
|
Loading…
Reference in a new issue