Commit ubunut patch from <xnox> to change default s390x minimum arch

debian/changelog

@@ -1,3 +1,17 @@
+llvm-toolchain-10 (1:10.0.0-2) UNRELEASED; urgency=medium
+
+  [ Dimitri John Ledkov <xnox@ubuntu.com> ]
+  * s390x: set default abi to z196 for debian, and z13 for ubuntu.
+    LP: #1864226
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 27 Mar 2020 05:16:28 +0100
+
+llvm-toolchain-10 (1:10.0.0-1) unstable; urgency=medium
+
+  * New release
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 24 Mar 2020 17:37:07 +0100
+
 llvm-toolchain-10 (1:10.0.0~+rc6-1) unstable; urgency=medium
 
   [ Sylvestre Ledru ]

debian/patches/0001-systemz-allow-configuring-default-SYSTEMZ_DEFAULT_AR.patch

@@ -0,0 +1,39 @@
+From 3d76b4f33d2e9b5f8ec1e0a5866f9bafc7d6186d Mon Sep 17 00:00:00 2001
+From: Dimitri John Ledkov <xnox@ubuntu.com>
+Date: Tue, 10 Mar 2020 12:26:39 +0000
+Subject: [PATCH] systemz: allow configuring default SYSTEMZ_DEFAULT_ARCH.
+
+Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
+---
+ CMakeLists.txt                         | 4 ++++
+ lib/Driver/ToolChains/Arch/SystemZ.cpp | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+Index: llvm-toolchain-10-10.0.0~+rc5/clang/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-10-10.0.0~+rc5.orig/clang/CMakeLists.txt
++++ llvm-toolchain-10-10.0.0~+rc5/clang/CMakeLists.txt
+@@ -306,6 +306,10 @@ if (NOT DEFINED MATCHED_ARCH OR "${CMAKE
+     "Default architecture for OpenMP offloading to Nvidia GPUs." FORCE)
+ endif()
+ 
++set(CLANG_SYSTEMZ_DEFAULT_ARCH "z10" CACHE STRING
++  "SystemZ Default Arch")
++add_definitions( -DCLANG_SYSTEMZ_DEFAULT_ARCH="${CLANG_SYSTEMZ_DEFAULT_ARCH}")
++
+ set(CLANG_VENDOR ${PACKAGE_VENDOR} CACHE STRING
+   "Vendor-specific text for showing with version information.")
+ 
+Index: llvm-toolchain-10-10.0.0~+rc5/clang/lib/Driver/ToolChains/Arch/SystemZ.cpp
+===================================================================
+--- llvm-toolchain-10-10.0.0~+rc5.orig/clang/lib/Driver/ToolChains/Arch/SystemZ.cpp
++++ llvm-toolchain-10-10.0.0~+rc5/clang/lib/Driver/ToolChains/Arch/SystemZ.cpp
+@@ -30,7 +30,7 @@ std::string systemz::getSystemZTargetCPU
+ 
+     return CPUName;
+   }
+-  return "z10";
++  return CLANG_SYSTEMZ_DEFAULT_ARCH;
+ }
+ 
+ void systemz::getSystemZTargetFeatures(const ArgList &Args,

debian/patches/series

@@ -140,3 +140,5 @@ python3-shebang.patch
 print-lldb-path.patch
 no-cgi.patch
 d21664cce1db8debe2528f36b1fbd2b8af9c9401.patch
+
+0001-systemz-allow-configuring-default-SYSTEMZ_DEFAULT_AR.patch

debian/rules

@@ -75,6 +75,12 @@ ifneq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
 endif
 endif
 
+ZARCH=z196
+ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
+ZARCH=z13
+endif
+CMAKE_EXTRA += -DCLANG_SYSTEMZ_DEFAULT_ARCH=$(ZARCH)
+
 export CC=gcc-$(GCC_VERSION)
 export CXX=g++-$(GCC_VERSION)