From 6560d9b48ba5251b6466ef605eb79be05ed1b094 Mon Sep 17 00:00:00 2001
From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 10 Nov 2020 22:53:39 +0000
Subject: [PATCH] Apply upstream fix for build with llvm10 on arm.

---
 debian/changelog                    |  3 +++
 debian/patches/fix-llvm10-arm.patch | 29 +++++++++++++++++++++++++++++
 src/debuginfo.cpp                   |  5 ++++-
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/fix-llvm10-arm.patch

diff --git a/debian/changelog b/debian/changelog
index 1625aac..7ced128 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ julia (1.5.3+dfsg-1+rpi1) bullseye-staging; urgency=medium
   * Upload package despite armv7 contamination check fail in
     libopenblas64_.so I think it's probablly a false positive.
 
+  [changes introduced in 1.5.3+dfsg-1+rpi1 by Peter Michael Green]
+  * Apply upstream fix for build with llvm 10 on arm.
+
  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 10 Nov 2020 08:00:02 +0000
 
 julia (1.5.3+dfsg-1) unstable; urgency=medium
diff --git a/debian/patches/fix-llvm10-arm.patch b/debian/patches/fix-llvm10-arm.patch
new file mode 100644
index 0000000..4952f03
--- /dev/null
+++ b/debian/patches/fix-llvm10-arm.patch
@@ -0,0 +1,29 @@
+commit 971e769479a2947a55cc253dc9750fd2a361367a
+Author: Yichao Yu <yyc1992@gmail.com>
+Date:   Fri Jul 17 00:26:39 2020 -0400
+
+    Fix C++ code compilation on ARM with LLVM10 (#36674)
+
+diff --git a/src/debuginfo.cpp b/src/debuginfo.cpp
+index a03b7447fa..46edf285d3 100644
+--- a/src/debuginfo.cpp
++++ b/src/debuginfo.cpp
+@@ -243,14 +243,17 @@ public:
+                 auto sName = section.getName();
+                 if (!sName)
+                     continue;
++                if (sName.get() != ".ARM.exidx") {
++                    continue;
++                }
+ #else
+                 StringRef sName;
+                 if (section.getName(sName))
+                     continue;
+-#endif
+                 if (sName != ".ARM.exidx") {
+                     continue;
+                 }
++#endif
+             }
+             uint64_t loadaddr = L.getSectionLoadAddress(section);
+             size_t seclen = section.getSize();
diff --git a/src/debuginfo.cpp b/src/debuginfo.cpp
index 0c53092..3e01f10 100644
--- a/src/debuginfo.cpp
+++ b/src/debuginfo.cpp
@@ -275,14 +275,17 @@ public:
                 auto sName = section.getName();
                 if (!sName)
                     continue;
+                if (sName.get() != ".ARM.exidx") {
+                    continue;
+                }
 #else
                 StringRef sName;
                 if (section.getName(sName))
                     continue;
-#endif
                 if (sName != ".ARM.exidx") {
                     continue;
                 }
+#endif
             }
             uint64_t loadaddr = L.getSectionLoadAddress(section);
             size_t seclen = section.getSize();
-- 
2.30.2