From d05ebbae8dcfa7e412e0befe97459a6cd53465fe Mon Sep 17 00:00:00 2001 From: "John L. Singleton" Date: Mon, 13 Mar 2023 13:58:38 -0400 Subject: [PATCH 1/8] integrate qcc --- scripts/matrix_testing/CompileFixTool.ps1 | 2 +- scripts/matrix_testing/Config.ps1 | 4 ++++ scripts/matrix_testing/CreateMatrixTestReport.ps1 | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/matrix_testing/CompileFixTool.ps1 b/scripts/matrix_testing/CompileFixTool.ps1 index ba4cd2c146..882707255e 100755 --- a/scripts/matrix_testing/CompileFixTool.ps1 +++ b/scripts/matrix_testing/CompileFixTool.ps1 @@ -16,7 +16,7 @@ param( # The compiler to use. Valid values are 'clang' and 'arm-clang'. [Parameter(Mandatory)] - [ValidateSet('clang', 'armclang', 'tiarmclang', 'gcc')] + [ValidateSet('clang', 'armclang', 'tiarmclang', 'gcc', 'qcc')] [string] $Configuration ) diff --git a/scripts/matrix_testing/Config.ps1 b/scripts/matrix_testing/Config.ps1 index 9ae4bb9600..2a92980107 100644 --- a/scripts/matrix_testing/Config.ps1 +++ b/scripts/matrix_testing/Config.ps1 @@ -6,11 +6,13 @@ $COMPILER_MAPPINGS = @{ "gcc" = "g++"; "armclang" = "armclang"; "tiarmclang" = "tiarmclang"; + "qcc" = "qcc"; }; "c" = @{ "clang" = "clang"; "gcc" = "gcc"; + "qcc" = "qcc"; }; } @@ -20,11 +22,13 @@ $COMPILER_ARGS = @{ "gcc" = "-std=c++14 -fsyntax-only"; "armclang" = "-std=c++14 -fsyntax-only --target=arm-arm-none-eabi"; "tiarmclang" = "-std=c++14 -fsyntax-only --target=arm-arm-none-eabi"; + "qcc" = "-lang-c++ -V7.1.0 -Wc,-fsyntax-only -c -nopipe -std=c++14 -D_QNX_SOURCE -Vgcc_ntoaarch64le_cxx"; }; "c" = @{ "gcc" = "-fsyntax-only -std=c11"; "clang" = "-fsyntax-only -std=c11"; + "qcc" = "-V7.1.0 -Wc,-fsyntax-only -c -nopipe -std=c11 -Vgcc_ntoaarch64le"; }; } diff --git a/scripts/matrix_testing/CreateMatrixTestReport.ps1 b/scripts/matrix_testing/CreateMatrixTestReport.ps1 index f60889fa7a..d306a3f0d9 100644 --- a/scripts/matrix_testing/CreateMatrixTestReport.ps1 +++ b/scripts/matrix_testing/CreateMatrixTestReport.ps1 @@ -53,7 +53,7 @@ All Parameters: Accept wildcard characters? false -Configuration - The compiler to use. Valid values are 'clang' and 'arm-clang'. + The compiler to use. Required? true Position? named @@ -140,9 +140,9 @@ param( [string] $NumThreads = 10, - # The compiler to use. Valid values are 'clang' and 'arm-clang'. + # The compiler to use. [Parameter(Mandatory)] - [ValidateSet('clang', 'armclang', 'tiarmclang', 'gcc')] + [ValidateSet('clang', 'armclang', 'tiarmclang', 'gcc', 'qcc')] [string] $Configuration, From a25aa963361c646c57dd9443867642318de8bc47 Mon Sep 17 00:00:00 2001 From: "John L. Singleton" Date: Mon, 13 Mar 2023 14:54:32 -0400 Subject: [PATCH 2/8] tset --- c/cert/test/rules/ARR39-C/test.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/c/cert/test/rules/ARR39-C/test.c b/c/cert/test/rules/ARR39-C/test.c index 937dce9cf5..26425ecb72 100644 --- a/c/cert/test/rules/ARR39-C/test.c +++ b/c/cert/test/rules/ARR39-C/test.c @@ -27,4 +27,7 @@ void f1() { (void)v1[10 / sizeof(v1)]; // NON_COMPLIANT v4 += offset; // COMPLIANT f2(offset, 2); -} \ No newline at end of file +} + + +//// \ No newline at end of file From 544c1ba20dfce6fced36546eae7b4144ccab4e92 Mon Sep 17 00:00:00 2001 From: "John L. Singleton" Date: Mon, 13 Mar 2023 15:05:27 -0400 Subject: [PATCH 3/8] test --- c/cert/test/rules/ARR39-C/test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c/cert/test/rules/ARR39-C/test.c b/c/cert/test/rules/ARR39-C/test.c index 26425ecb72..83ad6c6f5b 100644 --- a/c/cert/test/rules/ARR39-C/test.c +++ b/c/cert/test/rules/ARR39-C/test.c @@ -30,4 +30,4 @@ void f1() { } -//// \ No newline at end of file +/// \ No newline at end of file From 7ecd4e3a1cf2551c473227380c411d922745a126 Mon Sep 17 00:00:00 2001 From: "John L. Singleton" Date: Mon, 13 Mar 2023 15:12:20 -0400 Subject: [PATCH 4/8] fix --- c/cert/test/rules/ARR39-C/test.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/c/cert/test/rules/ARR39-C/test.c b/c/cert/test/rules/ARR39-C/test.c index 83ad6c6f5b..8b2a472a94 100644 --- a/c/cert/test/rules/ARR39-C/test.c +++ b/c/cert/test/rules/ARR39-C/test.c @@ -28,6 +28,3 @@ void f1() { v4 += offset; // COMPLIANT f2(offset, 2); } - - -/// \ No newline at end of file From 9df0465ae06a18f14c74d385f8222ab8347e8f6b Mon Sep 17 00:00:00 2001 From: "John L. Singleton" Date: Mon, 13 Mar 2023 15:48:24 -0400 Subject: [PATCH 5/8] trigger test and version change --- c/cert/test/rules/ARR39-C/test.c | 2 ++ scripts/matrix_testing/Config.ps1 | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/c/cert/test/rules/ARR39-C/test.c b/c/cert/test/rules/ARR39-C/test.c index 8b2a472a94..15ae78d33b 100644 --- a/c/cert/test/rules/ARR39-C/test.c +++ b/c/cert/test/rules/ARR39-C/test.c @@ -28,3 +28,5 @@ void f1() { v4 += offset; // COMPLIANT f2(offset, 2); } + +// \ No newline at end of file diff --git a/scripts/matrix_testing/Config.ps1 b/scripts/matrix_testing/Config.ps1 index 2a92980107..c904a06863 100644 --- a/scripts/matrix_testing/Config.ps1 +++ b/scripts/matrix_testing/Config.ps1 @@ -22,13 +22,13 @@ $COMPILER_ARGS = @{ "gcc" = "-std=c++14 -fsyntax-only"; "armclang" = "-std=c++14 -fsyntax-only --target=arm-arm-none-eabi"; "tiarmclang" = "-std=c++14 -fsyntax-only --target=arm-arm-none-eabi"; - "qcc" = "-lang-c++ -V7.1.0 -Wc,-fsyntax-only -c -nopipe -std=c++14 -D_QNX_SOURCE -Vgcc_ntoaarch64le_cxx"; + "qcc" = "-lang-c++ -V8.3.0 -Wc,-fsyntax-only -c -nopipe -std=c++14 -D_QNX_SOURCE -Vgcc_ntoaarch64le_cxx"; }; "c" = @{ "gcc" = "-fsyntax-only -std=c11"; "clang" = "-fsyntax-only -std=c11"; - "qcc" = "-V7.1.0 -Wc,-fsyntax-only -c -nopipe -std=c11 -Vgcc_ntoaarch64le"; + "qcc" = "-V8.3.0 -Wc,-fsyntax-only -c -nopipe -std=c11 -Vgcc_ntoaarch64le"; }; } From 0e554c101b68cc4b32797c7f4bac19b1f248eb85 Mon Sep 17 00:00:00 2001 From: "John L. Singleton" Date: Mon, 13 Mar 2023 15:53:22 -0400 Subject: [PATCH 6/8] undo --- c/cert/test/rules/ARR39-C/test.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/c/cert/test/rules/ARR39-C/test.c b/c/cert/test/rules/ARR39-C/test.c index 15ae78d33b..8b2a472a94 100644 --- a/c/cert/test/rules/ARR39-C/test.c +++ b/c/cert/test/rules/ARR39-C/test.c @@ -28,5 +28,3 @@ void f1() { v4 += offset; // COMPLIANT f2(offset, 2); } - -// \ No newline at end of file From bf387a19726e5c4de161376bfcd044d7df71ee2d Mon Sep 17 00:00:00 2001 From: "John L. Singleton" Date: Mon, 13 Mar 2023 16:24:00 -0400 Subject: [PATCH 7/8] boop --- c/cert/test/rules/ARR39-C/test.c | 1 + 1 file changed, 1 insertion(+) diff --git a/c/cert/test/rules/ARR39-C/test.c b/c/cert/test/rules/ARR39-C/test.c index 8b2a472a94..db8c54fa14 100644 --- a/c/cert/test/rules/ARR39-C/test.c +++ b/c/cert/test/rules/ARR39-C/test.c @@ -28,3 +28,4 @@ void f1() { v4 += offset; // COMPLIANT f2(offset, 2); } +// \ No newline at end of file From a7c8d74d40e936c72e0ac2e8ec908f1e609d3032 Mon Sep 17 00:00:00 2001 From: "John L. Singleton" Date: Tue, 14 Mar 2023 13:12:09 -0400 Subject: [PATCH 8/8] fix! --- scripts/matrix_testing/CompileFixTool.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/matrix_testing/CompileFixTool.ps1 b/scripts/matrix_testing/CompileFixTool.ps1 index 882707255e..86a6481b8e 100755 --- a/scripts/matrix_testing/CompileFixTool.ps1 +++ b/scripts/matrix_testing/CompileFixTool.ps1 @@ -14,7 +14,7 @@ param( [string] $Language, - # The compiler to use. Valid values are 'clang' and 'arm-clang'. + # The compiler to use. [Parameter(Mandatory)] [ValidateSet('clang', 'armclang', 'tiarmclang', 'gcc', 'qcc')] [string]