diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:13:25 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:13:25 +0000 |
commit | e96f7c79b513f3d2d4e1134b20c85e0a3c126cb4 (patch) | |
tree | cbee48aa7ebd3f30ccc92f6d0754db5802a55119 /debian/patches/d-rustc-fix-mips64el-bootstrap.patch | |
parent | Merging upstream version 1.66.0+dfsg1. (diff) | |
download | rustc-e96f7c79b513f3d2d4e1134b20c85e0a3c126cb4.tar.xz rustc-e96f7c79b513f3d2d4e1134b20c85e0a3c126cb4.zip |
Merging debian version 1.66.0+dfsg1-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/d-rustc-fix-mips64el-bootstrap.patch')
-rw-r--r-- | debian/patches/d-rustc-fix-mips64el-bootstrap.patch | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/debian/patches/d-rustc-fix-mips64el-bootstrap.patch b/debian/patches/d-rustc-fix-mips64el-bootstrap.patch index 06d73098a..17ce2e563 100644 --- a/debian/patches/d-rustc-fix-mips64el-bootstrap.patch +++ b/debian/patches/d-rustc-fix-mips64el-bootstrap.patch @@ -38,21 +38,17 @@ index e0d5f6f..57ad8c4 100644 max_atomic_width: Some(64), mcount: "_mcount".into(), -diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py -index 92d29d6..23c0764 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py -@@ -734,6 +734,8 @@ class RustBuild(object): +@@ -745,6 +745,8 @@ # preserve existing RUSTFLAGS env.setdefault("RUSTFLAGS", "") + if self.build_triple().startswith('mips'): + env["RUSTFLAGS"] += " -Ctarget-feature=+xgot" - build_section = "target.{}".format(self.build) target_features = [] if self.get_toml("crt-static", build_section) == "true": -diff --git a/src/test/assembly/asm/mips-types.rs b/src/test/assembly/asm/mips-types.rs -index 04bf49a..a7c6056 100644 + target_features += ["+crt-static"] --- a/src/test/assembly/asm/mips-types.rs +++ b/src/test/assembly/asm/mips-types.rs @@ -1,3 +1,4 @@ |