From 636c48ab40f8a312ed71ea82dc8763a9e1eb1c1b Mon Sep 17 00:00:00 2001
From: Ben Cressey <bcressey@amazon.com>
Date: Mon, 4 Oct 2021 16:52:40 +0000
Subject: [PATCH] update Rust to 1.55.0

Fix the logic for custom vendor targets to account for refactoring of
the aarch64-unknown-linux-gnu target upstream:
  https://github.com/rust-lang/rust/pull/86231

Signed-off-by: Ben Cressey <bcressey@amazon.com>
---
 Dockerfile  |  4 +++-
 hashes/rust | 30 +++++++++++++++---------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e2021221..c5d977a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -305,7 +305,7 @@ RUN \
 ARG ARCH
 ARG HOST_ARCH
 ARG VENDOR="bottlerocket"
-ARG RUSTVER="1.53.0"
+ARG RUSTVER="1.55.0"
 
 USER builder
 WORKDIR /home/builder
@@ -353,6 +353,8 @@ RUN \
     cp compiler/rustc_target/src/spec/${ARCH}_{unknown,${VENDOR}}_linux_${libc}.rs && \
     sed -i -e '/let mut base = super::linux_'${libc}'_base::opts();/a base.vendor = "'${VENDOR}'".to_string();' \
       compiler/rustc_target/src/spec/${ARCH}_${VENDOR}_linux_${libc}.rs && \
+    sed -i -e '/ \.\.super::linux_'${libc}'_base::opts()/i vendor: "'${VENDOR}'".to_string(),' \
+      compiler/rustc_target/src/spec/${ARCH}_${VENDOR}_linux_${libc}.rs && \
     sed -i -e '/("'${ARCH}-unknown-linux-${libc}'", .*),/a("'${ARCH}-${VENDOR}-linux-${libc}'", '${ARCH}_${VENDOR}_linux_${libc}'),' \
       compiler/rustc_target/src/spec/mod.rs ; \
   done && \
diff --git a/hashes/rust b/hashes/rust
index efeeca29..55c1f03f 100644
--- a/hashes/rust
+++ b/hashes/rust
@@ -1,15 +1,15 @@
-# https://static.rust-lang.org/dist/rustc-1.53.0-src.tar.xz
-SHA512 (rustc-1.53.0-src.tar.xz) = 70485cf7a0f7fc36ee31644e546374079dc387a85b44e5e793707fd0a4d7ca05d311291e78b86db955485d8f21c47ff9e1908acc4da68ba04929287213a40c24
-### See https://github.com/rust-lang/rust/blob/1.53.0/src/stage0.txt for what to use below. ###
-# https://static.rust-lang.org/dist/2021-05-06/rust-std-1.52.0-x86_64-unknown-linux-gnu.tar.xz
-SHA512 (rust-std-1.52.0-x86_64-unknown-linux-gnu.tar.xz) = 4affdea14e6ee015bb09ac5956a94275e321c7fa80feaa892e55bee692e7d022103cdcb6832cfb62ec797d4db062c0762dd60ddeddfcb9e5fad184076ef3ff93
-# https://static.rust-lang.org/dist/2021-05-06/rustc-1.52.0-x86_64-unknown-linux-gnu.tar.xz
-SHA512 (rustc-1.52.0-x86_64-unknown-linux-gnu.tar.xz) = 75c7de819acf46bc136e5361aab4b00fcf7d8ea6717317fb858a099c5304053d23b80fb1aeb8e5da48e8916a27ef5ecf3fd14c006bf54a52d8d7f1bbcc43c113
-# https://static.rust-lang.org/dist/2021-05-06/cargo-1.52.0-x86_64-unknown-linux-gnu.tar.xz
-SHA512 (cargo-1.52.0-x86_64-unknown-linux-gnu.tar.xz) = e8456fea80df70f687362fa364697c7cd77e1dfda66ddeb1fb58b4aa0a1d8702e24a914f1104ca2201007362095da8853ffe277ef3ab780289b757072a677b47
-# https://static.rust-lang.org/dist/2021-05-06/rust-std-1.52.0-aarch64-unknown-linux-gnu.tar.xz
-SHA512 (rust-std-1.52.0-aarch64-unknown-linux-gnu.tar.xz) = c1ac821611c69a95afc98374a17c1e4815e9b5337c67c0ce94e56baef5e8ecd6ed9bd48413657c9cb7c02a94368a8a55ab3079982196f96d4c44686c30b941a3
-# https://static.rust-lang.org/dist/2021-05-06/rustc-1.52.0-aarch64-unknown-linux-gnu.tar.xz
-SHA512 (rustc-1.52.0-aarch64-unknown-linux-gnu.tar.xz) = 04646d6d9ed859791b2aef6e27535e9b3a7c841e131cb139051bbce24f450e5b9b163e258119a5c81cd0118e237e36f95ac8d0ca5fbadf09a82067e20a112b41
-# https://static.rust-lang.org/dist/2021-05-06/cargo-1.52.0-aarch64-unknown-linux-gnu.tar.xz
-SHA512 (cargo-1.52.0-aarch64-unknown-linux-gnu.tar.xz) = 71856bb447f920052bdb37a73a8919cc779cfc60142a9bafcffa121626099b96762fe87448762e3a64beaf06d951fb4cc3c4e4118aac19253208e3d7f37b2616
+# https://static.rust-lang.org/dist/rustc-1.55.0-src.tar.xz
+SHA512 (rustc-1.55.0-src.tar.xz) = 7522f2fa95d5af92472404ecc97d7d9e745e88c933196a83fa373ce1efff6db3c295e0e2afdbfa1ff00644554efa0c3c7f6c11f9119ecf9010cb440b3f27c2da
+### See https://github.com/rust-lang/rust/blob/1.55.0/src/stage0.txt for what to use below. ###
+# https://static.rust-lang.org/dist/2021-07-29/rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz
+SHA512 (rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz) = 330a347a7633a00bd3e5cc6f37e9ba5db7acbf87d7fc7a6ddd53efbdcf918f52d66310921bac3125caf1106c7f6300bbbf897a10009800418ddad51b9c6f8085
+# https://static.rust-lang.org/dist/2021-07-29/rustc-1.54.0-x86_64-unknown-linux-gnu.tar.xz
+SHA512 (rustc-1.54.0-x86_64-unknown-linux-gnu.tar.xz) = 4f624af9e35be3037c32bf25618049b3101ea8d00e23164d49651f8b2dbf4ca24689bc13a8b68241a22fb9ec0390f421837a3a11ec816cf81791f8682db19cc8
+# https://static.rust-lang.org/dist/2021-07-29/cargo-1.54.0-x86_64-unknown-linux-gnu.tar.xz
+SHA512 (cargo-1.54.0-x86_64-unknown-linux-gnu.tar.xz) = f113c8a59888fef6ba8f3fdd555456625050de8616b60dc4f7fdf4602f8f8754fb0014169a4670d027c8060c1cd0f2dfaca2832e664314f6f0714e8d9535c2ca
+# https://static.rust-lang.org/dist/2021-07-29/rust-std-1.54.0-aarch64-unknown-linux-gnu.tar.xz
+SHA512 (rust-std-1.54.0-aarch64-unknown-linux-gnu.tar.xz) = a12a1d2abb2fae7b8def01fdffd67beb26aba5cce0af71504ad219be39a6f9e067b61dde4f3dc98cc48994922d3cd22182a6e8d45f7adcc1f70ba88ae882dd21
+# https://static.rust-lang.org/dist/2021-07-29/rustc-1.54.0-aarch64-unknown-linux-gnu.tar.xz
+SHA512 (rustc-1.54.0-aarch64-unknown-linux-gnu.tar.xz) = 6b14e43ff8f2262e313040fd6677acbeb43d21732299dc968b919e1210bb44f8e3d837ab9d729185ce1953681310fba632cc8c7a025bbcce5ee8caedbc1c70ab
+# https://static.rust-lang.org/dist/2021-07-29/cargo-1.54.0-aarch64-unknown-linux-gnu.tar.xz
+SHA512 (cargo-1.54.0-aarch64-unknown-linux-gnu.tar.xz) = cd104a35df83c8214283ab26b6363ab70490adc799fca4d4e42ed623e6c9c87d14c7a039254fb6e45927bb21434f8a0c803dd0aea3013c30218646e0152b909a