From b15ea3633833c84cb09ab6d58044da08ba6e125b Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Mon, 22 Jan 2024 09:24:31 -0800 Subject: [PATCH 1/4] Improve comments --- Package.swift | 18 +++++------------- aws-common-runtime/aws-c-auth | 2 +- aws-common-runtime/aws-c-io | 2 +- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Package.swift b/Package.swift index a9b3d0ccc..a472286af 100644 --- a/Package.swift +++ b/Package.swift @@ -33,7 +33,7 @@ var awsCCommonPlatformExcludes = ["source/android", "source/linux/system_info.c", "bin/"] + excludesFromAll -// includes arch/generic +// includes arch/generic because the Swift PM doesn't like the necessary compiler flags. awsCCommonPlatformExcludes.append("source/arch/intel") awsCCommonPlatformExcludes.append("source/arch/arm") #if !os(Windows) @@ -143,21 +143,13 @@ var awsCChecksumsExcludes = [ // swift never uses Microsoft Visual C++ compiler awsCChecksumsExcludes.append("source/intel/visualc") -// TODO: enable hardware acceleration https://github.com/awslabs/aws-sdk-swift/issues/867 -// #if arch(arm64) -//// includes source/arm -//// TODO: look at the compiler flag in C -// awsCChecksumsExcludes.append("source/intel") -// awsCChecksumsExcludes.append("source/generic") -// #elseif arch(x86_64) || arch(i386) -//// include src/intel/asm -// awsCChecksumsExcludes.append("source/arm") -// awsCChecksumsExcludes.append("source/generic") -// #else +// Hardware accellarated checksums are disabled because Swift PM doesn't like the necessary compiler flag. +// We can add it once Swift PM manager has the necessary support for compiler flags or build using CMake. +// See: https://github.com/apple/swift-package-manager/issues/4555 +// Also see issue: https://github.com/awslabs/aws-sdk-swift/issues/867 before enabling hardware accelarated checksums. // includes source/generic awsCChecksumsExcludes.append("source/arm") awsCChecksumsExcludes.append("source/intel") -// #endif ////////////////////////////////////////////////////////////////////// /// aws-c-sdkutils diff --git a/aws-common-runtime/aws-c-auth b/aws-common-runtime/aws-c-auth index 3d9f13fd6..7911fa28a 160000 --- a/aws-common-runtime/aws-c-auth +++ b/aws-common-runtime/aws-c-auth @@ -1 +1 @@ -Subproject commit 3d9f13fd6610d2c9f5ef5cf404bce4d9aeaca15b +Subproject commit 7911fa28a45d378d9a6927e0a60f4e270d339f1f diff --git a/aws-common-runtime/aws-c-io b/aws-common-runtime/aws-c-io index 749c87e55..6225ebb9d 160000 --- a/aws-common-runtime/aws-c-io +++ b/aws-common-runtime/aws-c-io @@ -1 +1 @@ -Subproject commit 749c87e551465ff1a3c2e8a77b1181bccff2f4b6 +Subproject commit 6225ebb9da28f1023ad5e21694de9d165cd65f3b From 5b545fc49c37922dd14e28a6f405e2f22d9d6e28 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Mon, 22 Jan 2024 09:28:22 -0800 Subject: [PATCH 2/4] improve comments --- Package.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index a472286af..cbc5d6cf6 100644 --- a/Package.swift +++ b/Package.swift @@ -143,8 +143,10 @@ var awsCChecksumsExcludes = [ // swift never uses Microsoft Visual C++ compiler awsCChecksumsExcludes.append("source/intel/visualc") + // Hardware accellarated checksums are disabled because Swift PM doesn't like the necessary compiler flag. -// We can add it once Swift PM manager has the necessary support for compiler flags or build using CMake. +// We can add it once Swift package manager has the necessary support for compiler flags or build C libraries +// using CMake. // See: https://github.com/apple/swift-package-manager/issues/4555 // Also see issue: https://github.com/awslabs/aws-sdk-swift/issues/867 before enabling hardware accelarated checksums. // includes source/generic From 16e3f253e9453e0e9c9bd4f42f6ca9cef281dad6 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Mon, 22 Jan 2024 09:30:09 -0800 Subject: [PATCH 3/4] Update comment --- Package.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index cbc5d6cf6..32a239472 100644 --- a/Package.swift +++ b/Package.swift @@ -144,11 +144,11 @@ var awsCChecksumsExcludes = [ // swift never uses Microsoft Visual C++ compiler awsCChecksumsExcludes.append("source/intel/visualc") -// Hardware accellarated checksums are disabled because Swift PM doesn't like the necessary compiler flag. -// We can add it once Swift package manager has the necessary support for compiler flags or build C libraries +// Hardware accelerated checksums are disabled because Swift PM doesn't like the necessary compiler flags. +// We can add it once Swift package manager has the necessary support for CPU flags or builds C libraries // using CMake. // See: https://github.com/apple/swift-package-manager/issues/4555 -// Also see issue: https://github.com/awslabs/aws-sdk-swift/issues/867 before enabling hardware accelarated checksums. +// Also, see issue: https://github.com/awslabs/aws-sdk-swift/issues/867 before enabling hardware accelerated checksums. // includes source/generic awsCChecksumsExcludes.append("source/arm") awsCChecksumsExcludes.append("source/intel") From 7fcafcc1480bcecbb84e4a8635a8c355364e644c Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Mon, 22 Jan 2024 13:16:12 -0800 Subject: [PATCH 4/4] Change Swift PM to SwiftPM --- Package.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index 32a239472..722635292 100644 --- a/Package.swift +++ b/Package.swift @@ -33,7 +33,7 @@ var awsCCommonPlatformExcludes = ["source/android", "source/linux/system_info.c", "bin/"] + excludesFromAll -// includes arch/generic because the Swift PM doesn't like the necessary compiler flags. +// includes arch/generic because the SwiftPM doesn't like the necessary compiler flags. awsCCommonPlatformExcludes.append("source/arch/intel") awsCCommonPlatformExcludes.append("source/arch/arm") #if !os(Windows) @@ -144,8 +144,8 @@ var awsCChecksumsExcludes = [ // swift never uses Microsoft Visual C++ compiler awsCChecksumsExcludes.append("source/intel/visualc") -// Hardware accelerated checksums are disabled because Swift PM doesn't like the necessary compiler flags. -// We can add it once Swift package manager has the necessary support for CPU flags or builds C libraries +// Hardware accelerated checksums are disabled because SwiftPM doesn't like the necessary compiler flags. +// We can add it once SwiftPM has the necessary support for CPU flags or builds C libraries // using CMake. // See: https://github.com/apple/swift-package-manager/issues/4555 // Also, see issue: https://github.com/awslabs/aws-sdk-swift/issues/867 before enabling hardware accelerated checksums.