From 8fca18b67658ac394e68f63c1461f57bdc1486d7 Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57@debian.org>
Date: Sun, 24 Jan 2021 11:18:12 +0000
Subject: [PATCH] do not use -specs=nosys.specs on Debian ARM architectures

Forwarded: not-needed
Last-Update: 2021-01-05

This requires gcc-arm-none-eabi which we do not want to depend on.

Gbp-Pq: Name no_nosys_specs.diff
---
 examples/baremetal/pca10001/greenblink/greenblink.qbs        | 5 +----
 examples/baremetal/pca10040/greenblink/greenblink.qbs        | 5 +----
 examples/baremetal/stm32f103/greenblink/greenblink.qbs       | 5 +----
 examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs  | 5 +----
 .../blackbox/testdata-baremetal/BareMetalApplication.qbs     | 5 -----
 .../blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs   | 5 -----
 6 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/examples/baremetal/pca10001/greenblink/greenblink.qbs b/examples/baremetal/pca10001/greenblink/greenblink.qbs
index f5e4c3cc..885f7e91 100644
--- a/examples/baremetal/pca10001/greenblink/greenblink.qbs
+++ b/examples/baremetal/pca10001/greenblink/greenblink.qbs
@@ -54,10 +54,7 @@ CppApplication {
     condition: {
         if (!qbs.architecture.startsWith("arm"))
             return false;
-        return (qbs.toolchain.contains("gcc")
-                || qbs.toolchain.contains("iar")
-                || qbs.toolchain.contains("keil"))
-                && !qbs.toolchain.contains("xcode")
+        return false;
     }
     name: "pca10001-greenblink"
     cpp.cLanguageVersion: "c99"
diff --git a/examples/baremetal/pca10040/greenblink/greenblink.qbs b/examples/baremetal/pca10040/greenblink/greenblink.qbs
index dcf9c388..90cae82f 100644
--- a/examples/baremetal/pca10040/greenblink/greenblink.qbs
+++ b/examples/baremetal/pca10040/greenblink/greenblink.qbs
@@ -54,10 +54,7 @@ CppApplication {
     condition: {
         if (!qbs.architecture.startsWith("arm"))
             return false;
-        return (qbs.toolchain.contains("gcc")
-                || qbs.toolchain.contains("iar")
-                || qbs.toolchain.contains("keil"))
-                && !qbs.toolchain.contains("xcode")
+        return false;
     }
     name: "pca10040-greenblink"
     cpp.cLanguageVersion: "c99"
diff --git a/examples/baremetal/stm32f103/greenblink/greenblink.qbs b/examples/baremetal/stm32f103/greenblink/greenblink.qbs
index d925344f..0db8ac27 100644
--- a/examples/baremetal/stm32f103/greenblink/greenblink.qbs
+++ b/examples/baremetal/stm32f103/greenblink/greenblink.qbs
@@ -54,10 +54,7 @@ CppApplication {
     condition: {
         if (!qbs.architecture.startsWith("arm"))
             return false;
-        return (qbs.toolchain.contains("gcc")
-                || qbs.toolchain.contains("iar")
-                || qbs.toolchain.contains("keil"))
-                && !qbs.toolchain.contains("xcode")
+        return false;
     }
     name: "stm32f103-greenblink"
     cpp.cLanguageVersion: "c99"
diff --git a/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs b/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs
index 4a89cf68..36ab19aa 100644
--- a/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs
+++ b/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs
@@ -54,10 +54,7 @@ CppApplication {
     condition: {
         if (!qbs.architecture.startsWith("arm"))
             return false;
-        return (qbs.toolchain.contains("gcc")
-                || qbs.toolchain.contains("iar")
-                || qbs.toolchain.contains("keil"))
-                && !qbs.toolchain.contains("xcode")
+        return false;
     }
     name: "stm32f4discovery-blueblink"
     cpp.cLanguageVersion: "c99"
diff --git a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
index fa678ebb..a433bdd3 100644
--- a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
@@ -81,11 +81,6 @@ CppApplication {
         cpp.assemblerFlags: ["--cpu", "cortex-m0"]
         cpp.driverFlags: ["-mcpu=cortex-m0", "--target=arm-arm-none-eabi"]
     }
-    Properties {
-        condition: qbs.toolchain.contains("gcc")
-            && qbs.architecture.startsWith("arm")
-        cpp.driverFlags: ["-specs=nosys.specs"]
-    }
     Properties {
         condition: qbs.toolchain.contains("gcc")
             && qbs.architecture === "xtensa"
diff --git a/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
index 56045516..bf41f4f8 100644
--- a/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
@@ -81,11 +81,6 @@ StaticLibrary {
         cpp.assemblerFlags: ["--cpu", "cortex-m0"]
         cpp.driverFlags: ["-mcpu=cortex-m0", "--target=arm-arm-none-eabi"]
     }
-    Properties {
-        condition: qbs.toolchain.contains("gcc")
-            && qbs.architecture.startsWith("arm")
-        cpp.driverFlags: ["-specs=nosys.specs"]
-    }
     Properties {
         condition: qbs.toolchain.contains("gcc")
             && qbs.architecture === "xtensa"
-- 
2.30.2