From 063ee8952cd2bf5bf39198386d84af70c9df45f3 Mon Sep 17 00:00:00 2001
From: Ximin Luo <infinity0@debian.org>
Date: Tue, 28 Jul 2020 21:51:25 +0100
Subject: [PATCH] Fix patch for line numbers on little-endian arches

---
 debian/changelog                     |  6 ++++++
 debian/patches/u-ignore-endian.patch | 31 +++++++++++++++++++++-------
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 16200c6391..eeeaa50beb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rustc (1.44.1+dfsg1-3) UNRELEASED; urgency=medium
+
+  * Fix patch for line numbers on little-endian arches.
+
+ -- Ximin Luo <infinity0@debian.org>  Tue, 28 Jul 2020 21:51:11 +0100
+
 rustc (1.44.1+dfsg1-2) unstable; urgency=medium
 
   * Ignore tests that assume little-endian on big-endian arches.
diff --git a/debian/patches/u-ignore-endian.patch b/debian/patches/u-ignore-endian.patch
index 0c407cf781..288cc3fe0f 100644
--- a/debian/patches/u-ignore-endian.patch
+++ b/debian/patches/u-ignore-endian.patch
@@ -46,36 +46,51 @@
  }
 --- a/src/test/mir-opt/const-promotion-extern-static.rs
 +++ b/src/test/mir-opt/const-promotion-extern-static.rs
-@@ -1,3 +1,4 @@
+@@ -1,7 +1,7 @@
 +// ignore-endian-big
  extern "C" {
      static X: i32;
  }
+-
+ static Y: i32 = 42;
+ 
+ // EMIT_MIR rustc.BAR.PromoteTemps.diff
 --- a/src/test/mir-opt/const_allocation.rs
 +++ b/src/test/mir-opt/const_allocation.rs
-@@ -1,3 +1,4 @@
+@@ -1,5 +1,5 @@
 +// ignore-endian-big
  // EMIT_MIR_FOR_EACH_BIT_WIDTH
- 
+-
  static FOO: &[(Option<i32>, &[&str])] =
+     &[(None, &[]), (None, &["foo", "bar"]), (Some(42), &["meh", "mop", "möp"])];
+ 
 --- a/src/test/mir-opt/const_allocation2.rs
 +++ b/src/test/mir-opt/const_allocation2.rs
-@@ -1,3 +1,4 @@
+@@ -1,5 +1,5 @@
 +// ignore-endian-big
  // EMIT_MIR_FOR_EACH_BIT_WIDTH
- 
+-
  // EMIT_MIR rustc.main.ConstProp.after.mir
+ fn main() {
+     FOO;
 --- a/src/test/mir-opt/const_allocation3.rs
 +++ b/src/test/mir-opt/const_allocation3.rs
-@@ -1,3 +1,4 @@
+@@ -1,5 +1,5 @@
 +// ignore-endian-big
  // EMIT_MIR_FOR_EACH_BIT_WIDTH
- 
+-
  // EMIT_MIR rustc.main.ConstProp.after.mir
+ fn main() {
+     FOO;
 --- a/src/test/mir-opt/inline/inline-into-box-place.rs
 +++ b/src/test/mir-opt/inline/inline-into-box-place.rs
-@@ -1,3 +1,4 @@
+@@ -1,8 +1,8 @@
 +// ignore-endian-big
  // ignore-wasm32-bare compiled with panic=abort by default
  // compile-flags: -Z mir-opt-level=3
  // EMIT_MIR_FOR_EACH_BIT_WIDTH
+ #![feature(box_syntax)]
+-
+ // EMIT_MIR rustc.main.Inline.diff
+ fn main() {
+     let _x: Box<Vec<u32>> = box Vec::new();