build: fixme qual

11 files changed, 102 insertions, 24 deletions

diff --git a/spec/build/bsps/optldflags.yml b/spec/build/bsps/optldflags.yml
index ce26f40508..75a8aed40f 100644
--- a/spec/build/bsps/optldflags.yml
+++ b/spec/build/bsps/optldflags.yml
@@ -13,8 +13,7 @@ default-by-family: []
 default-by-variant: []
 description: |
   Flags passed to the linker at the end of the link command.
-enabled-by:
-  not: RTEMS_QUAL_ONLY
+enabled-by: true
 links: []
 name: LDFLAGS
 type: build
diff --git a/spec/build/bsps/optldflagsqualonly.yml b/spec/build/bsps/optldflagsqualonly.yml
index 055c6c0a72..edbc86e2bd 100644
--- a/spec/build/bsps/optldflagsqualonly.yml
+++ b/spec/build/bsps/optldflagsqualonly.yml
@@ -2,13 +2,11 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 actions:
 - get-string: null
 - split: null
-- env-append: null
 - env-append: PKGCONFIG_LDFLAGS
 build-type: option
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -Wl,--gc-sections
 - -nodefaultlibs
 - -Wl,--start-group
 - -lrtemscpu
@@ -18,8 +16,9 @@ default:
 default-by-family: []
 default-by-variant: []
 description: |
-  Flags passed to the linker (GNU ld)
+  Flags passed to the linker recommended for applications if RTEMS_QUAL_ONLY is
+  enabled.
 enabled-by: RTEMS_QUAL_ONLY
 links: []
-name: LDFLAGS
+name: PKGCONFIG_LDFLAGS_QUAL_ONLY
 type: build
diff --git a/spec/build/cpukit/grp.yml b/spec/build/cpukit/grp.yml
index 46398625fc..fddf65e4f2 100644
--- a/spec/build/cpukit/grp.yml
+++ b/spec/build/cpukit/grp.yml
@@ -16,6 +16,8 @@ links:
 - role: build-dependency
   uid: optldflagscoverage
 - role: build-dependency
+  uid: optlinkflagsqual
+- role: build-dependency
   uid: libdebugger
 - role: build-dependency
   uid: libftpd
diff --git a/spec/build/cpukit/optlinkflagsqual.yml b/spec/build/cpukit/optlinkflagsqual.yml
new file mode 100644
index 0000000000..bb01043704
--- /dev/null
+++ b/spec/build/cpukit/optlinkflagsqual.yml
@@ -0,0 +1,19 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+actions:
+- get-string: null
+- split: null
+- env-append: LINKFLAGS
+build-type: option
+copyrights:
+- Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
+default:
+- -nodefaultlibs
+- -Wl,--start-group
+default-by-family: []
+default-by-variant: []
+description: |
+  Flags passed to the linker if RTEMS_QUAL is enabled.
+enabled-by: RTEMS_QUAL
+links: []
+name: LINKFLAGS_QUAL
+type: build
diff --git a/spec/build/testsuites/grp.yml b/spec/build/testsuites/grp.yml
index 5f786622ea..a340d0e6ba 100644
--- a/spec/build/testsuites/grp.yml
+++ b/spec/build/testsuites/grp.yml
@@ -44,9 +44,11 @@ links:
 - role: build-dependency
   uid: grpnoqual
 - role: build-dependency
-  uid: membench/grp
+  uid: grpvalqual
 - role: build-dependency
-  uid: validation/grp
+  uid: grpvalnoqual
+- role: build-dependency
+  uid: grpvalqualonly
 - role: build-dependency
   uid: testopts
 type: build
diff --git a/spec/build/testsuites/grpmost.yml b/spec/build/testsuites/grpmisc.yml
index faae6e9959..4c6b07ecd5 100644
--- a/spec/build/testsuites/grpmost.yml
+++ b/spec/build/testsuites/grpmisc.yml
@@ -2,7 +2,8 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 build-type: group
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-enabled-by: true
+enabled-by:
+  not: RTEMS_QUAL_ONLY
 includes:
 - ${BSP_INCLUDES}
 install: []
diff --git a/spec/build/testsuites/grpnoqual.yml b/spec/build/testsuites/grpnoqual.yml
index 0154e0039b..b0d85bf9c0 100644
--- a/spec/build/testsuites/grpnoqual.yml
+++ b/spec/build/testsuites/grpnoqual.yml
@@ -10,7 +10,7 @@ install: []
 ldflags: []
 links:
 - role: build-dependency
-  uid: grpmost
+  uid: grpmisc
 type: build
 use-after:
 - rtemscpu
diff --git a/spec/build/testsuites/grpqual.yml b/spec/build/testsuites/grpqual.yml
index 9412cfee4b..a33003b09e 100644
--- a/spec/build/testsuites/grpqual.yml
+++ b/spec/build/testsuites/grpqual.yml
@@ -2,32 +2,20 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 build-type: group
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-enabled-by:
-- and:
-  - RTEMS_QUAL
-  - not: RTEMS_QUAL_ONLY
+enabled-by: RTEMS_QUAL
 includes:
 - ${BSP_INCLUDES}
 install: []
 ldflags:
-- -nodefaultlibs
-- -Wl,--start-group
-- -lrtemstest
-- -lrtemstestextra
-- -lrtemsbsp
-- -lrtemsbspextra
-- -lrtemscpu
-- -lrtemscpuextra
 - -latomic
 - -lc
 - -lgcc
-- -lgcov
 - -lgomp
 - -lstdc++
 - -Wl,--end-group
 links:
 - role: build-dependency
-  uid: grpmost
+  uid: grpmisc
 type: build
 use-after:
 - rtemstestextra
diff --git a/spec/build/testsuites/grpvalnoqual.yml b/spec/build/testsuites/grpvalnoqual.yml
new file mode 100644
index 0000000000..c388d7e63b
--- /dev/null
+++ b/spec/build/testsuites/grpvalnoqual.yml
@@ -0,0 +1,20 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+build-type: group
+copyrights:
+- Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
+enabled-by:
+  not: RTEMS_QUAL
+includes:
+- ${BSP_INCLUDES}
+install: []
+ldflags: []
+links:
+- role: build-dependency
+  uid: membench/grp
+- role: build-dependency
+  uid: validation/grp
+type: build
+use-after:
+- rtemscpu
+- rtemsbsp
+use-before: []
diff --git a/spec/build/testsuites/grpvalqual.yml b/spec/build/testsuites/grpvalqual.yml
new file mode 100644
index 0000000000..88acde38f3
--- /dev/null
+++ b/spec/build/testsuites/grpvalqual.yml
@@ -0,0 +1,26 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+build-type: group
+copyrights:
+- Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
+enabled-by:
+  and:
+  - RTEMS_QUAL
+  - not: RTEMS_QUAL_ONLY
+includes:
+- ${BSP_INCLUDES}
+install: []
+ldflags:
+- -latomic
+- -lc
+- -lgcc
+- -Wl,--end-group
+links:
+- role: build-dependency
+  uid: membench/grp
+- role: build-dependency
+  uid: validation/grp
+type: build
+use-after:
+- rtemscpu
+- rtemsbsp
+use-before: []
diff --git a/spec/build/testsuites/grpvalqualonly.yml b/spec/build/testsuites/grpvalqualonly.yml
new file mode 100644
index 0000000000..217d396bbd
--- /dev/null
+++ b/spec/build/testsuites/grpvalqualonly.yml
@@ -0,0 +1,22 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+build-type: group
+copyrights:
+- Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
+enabled-by: RTEMS_QUAL_ONLY
+includes:
+- ${BSP_INCLUDES}
+install: []
+ldflags:
+- -latomic
+- -lgcc
+- -Wl,--end-group
+links:
+- role: build-dependency
+  uid: membench/grp
+- role: build-dependency
+  uid: validation/grp
+type: build
+use-after:
+- rtemscpu
+- rtemsbsp
+use-before: []