Merge 09feffa073 ("Merge tag 'timers-urgent-2026-06-07' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline
Steps on the way to v7.1-rc7 Change-Id: I1f09be1cdbdf7a3a46d7be876c2e6089eee57632 Signed-off-by: Carlos Llamas <cmllamas@google.com>
This commit is contained in:
commit
5b29bb2b1a
97 files changed
+721
-370
No files matched your search
@@ -80,7 +80,7 @@ ld-option = $(call try-run, $(LD) $(KBUILD_LDFLAGS) $(1) -v,$(1),$(2),$(3))
|
||||
# TODO: remove RUSTC_BOOTSTRAP=1 when we raise the minimum GNU Make version to 4.4
|
||||
__rustc-option = $(call try-run,\
|
||||
echo '$(pound)![allow(missing_docs)]$(pound)![feature(no_core)]$(pound)![no_core]' | RUSTC_BOOTSTRAP=1\
|
||||
$(1) --sysroot=/dev/null $(filter-out --sysroot=/dev/null --target=%,$(2)) $(3)\
|
||||
$(1) --sysroot=/dev/null $(KBUILD_RUSTFLAGS_OPTION_CHKS) $(filter-out --sysroot=/dev/null --target=%target.json,$(2)) $(3)\
|
||||
--crate-type=rlib --out-dir=$(TMPOUT) --emit=obj=- - >/dev/null,$(3),$(4))
|
||||
|
||||
# rustc-option
|
||||
|
||||
@@ -196,7 +196,9 @@ fn main() {
|
||||
}
|
||||
} else if cfg.has("X86_64") {
|
||||
ts.push("arch", "x86_64");
|
||||
if cfg.rustc_version_atleast(1, 86, 0) {
|
||||
if cfg.rustc_version_atleast(1, 98, 0) {
|
||||
ts.push("rustc-abi", "softfloat");
|
||||
} else if cfg.rustc_version_atleast(1, 86, 0) {
|
||||
ts.push("rustc-abi", "x86-softfloat");
|
||||
}
|
||||
ts.push(
|
||||
@@ -236,7 +238,9 @@ fn main() {
|
||||
panic!("32-bit x86 only works under UML");
|
||||
}
|
||||
ts.push("arch", "x86");
|
||||
if cfg.rustc_version_atleast(1, 86, 0) {
|
||||
if cfg.rustc_version_atleast(1, 98, 0) {
|
||||
ts.push("rustc-abi", "softfloat");
|
||||
} else if cfg.rustc_version_atleast(1, 86, 0) {
|
||||
ts.push("rustc-abi", "x86-softfloat");
|
||||
}
|
||||
ts.push(
|
||||
|
||||
Reference in new issue
Block a user