Skip to content

Commit 8d0269a

Browse files
justsmthjustsmth
committed
Fix Windows/x86
1 parent ec707eb commit 8d0269a

File tree

11 files changed

+42
-14
lines changed

11 files changed

+42
-14
lines changed

‎aws-lc-sys/builder/cc_builder.rs‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
mod apple_aarch64;
99
mod apple_x86_64;
1010
mod linux_aarch64;
11-
mod linux_i686;
1211
mod linux_ppc64le;
12+
mod linux_x86;
1313
mod linux_x86_64;
1414
mod universal;
1515
mod win_aarch64;
16+
mod win_x86;
1617
mod win_x86_64;
1718

1819
use crate::nasm_builder::NasmBuilder;
@@ -49,21 +50,25 @@ fn identify_sources() -> Vec<&'static str> {
4950
if target_os() == "windows" {
5051
if target_arch() == "x86_64" {
5152
source_files.append(&mut Vec::from(win_x86_64::CRYPTO_LIBRARY));
52-
} else if target_arch() == "aarch64" || target_arch() == "arm64" {
53+
} else if target_arch() == "aarch64" {
5354
source_files.append(&mut Vec::from(win_aarch64::CRYPTO_LIBRARY));
55+
} else if target_arch() == "x86" {
56+
source_files.append(&mut Vec::from(win_x86::CRYPTO_LIBRARY));
57+
} else {
58+
panic!("target_arch() = {}", target_arch());
5459
}
5560
} else if target_vendor() == "apple" {
5661
if target_arch() == "x86_64" {
5762
source_files.append(&mut Vec::from(apple_x86_64::CRYPTO_LIBRARY));
58-
} else if target_arch() == "aarch64" || target_arch() == "arm64" {
63+
} else if target_arch() == "aarch64" {
5964
source_files.append(&mut Vec::from(apple_aarch64::CRYPTO_LIBRARY));
6065
}
6166
} else if target_arch() == "x86_64" {
6267
source_files.append(&mut Vec::from(linux_x86_64::CRYPTO_LIBRARY));
63-
} else if target_arch() == "aarch64" || target_arch() == "arm64" {
68+
} else if target_arch() == "aarch64" {
6469
source_files.append(&mut Vec::from(linux_aarch64::CRYPTO_LIBRARY));
65-
} else if target_arch().ends_with("86") && target_arch().starts_with('i') {
66-
source_files.append(&mut Vec::from(linux_i686::CRYPTO_LIBRARY));
70+
} else if target_arch() == "x86" {
71+
source_files.append(&mut Vec::from(linux_x86::CRYPTO_LIBRARY));
6772
} else if target_arch() == "powerpc64le" {
6873
source_files.append(&mut Vec::from(linux_ppc64le::CRYPTO_LIBRARY));
6974
}

‎aws-lc-sys/builder/cc_builder/apple_aarch64.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0 OR ISC
3-
// Tue Sep 30 15:54:00 UTC 2025
43

54
pub(super) const CRYPTO_LIBRARY: &[&str] = &[
65
"crypto/fipsmodule/ml_kem/mlkem/native/aarch64/src/intt.S",

‎aws-lc-sys/builder/cc_builder/apple_x86_64.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0 OR ISC
3-
// Tue Sep 30 15:55:28 UTC 2025
43

54
pub(super) const CRYPTO_LIBRARY: &[&str] = &[
65
"crypto/fipsmodule/ml_kem/mlkem/native/x86_64/src/intt.S",

‎aws-lc-sys/builder/cc_builder/linux_aarch64.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0 OR ISC
3-
// Tue Sep 30 15:58:17 UTC 2025
43

54
pub(super) const CRYPTO_LIBRARY: &[&str] = &[
65
"crypto/fipsmodule/ml_kem/mlkem/native/aarch64/src/intt.S",

‎aws-lc-sys/builder/cc_builder/linux_ppc64le.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
// SPDX-License-Identifier: Apache-2.0 OR ISC
3+
14
pub(super) const CRYPTO_LIBRARY: &[&str] = &[
25
"generated-src/linux-ppc64le/crypto/fipsmodule/aesp8-ppc.S",
36
"generated-src/linux-ppc64le/crypto/fipsmodule/ghashp8-ppc.S",

‎aws-lc-sys/builder/cc_builder/linux_i686.rs‎ renamed to ‎aws-lc-sys/builder/cc_builder/linux_x86.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0 OR ISC
3-
// Tue Sep 30 15:58:42 UTC 2025
43

54
pub(super) const CRYPTO_LIBRARY: &[&str] = &[
65
"generated-src/linux-x86/crypto/chacha/chacha-x86.S",

‎aws-lc-sys/builder/cc_builder/linux_x86_64.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0 OR ISC
3-
// Tue Sep 30 15:53:39 UTC 2025
43

54
pub(super) const CRYPTO_LIBRARY: &[&str] = &[
65
"crypto/fipsmodule/ml_kem/mlkem/native/x86_64/src/intt.S",

‎aws-lc-sys/builder/cc_builder/win_aarch64.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0 OR ISC
3-
// Tue Sep 30 15:55:28 UTC 2025
43

54
pub(super) const CRYPTO_LIBRARY: &[&str] = &[
65
"generated-src/win-aarch64/crypto/chacha/chacha-armv8.S",

‎aws-lc-sys/builder/cc_builder/win_x86.rs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
// SPDX-License-Identifier: Apache-2.0 OR ISC
3+
4+
pub(super) const CRYPTO_LIBRARY: &[&str] = &[
5+
"generated-src/win-x86/crypto/test/trampoline-x86.asm",
6+
"generated-src/win-x86/crypto/chacha/chacha-x86.asm",
7+
"generated-src/win-x86/crypto/fipsmodule/sha256-586.asm",
8+
"generated-src/win-x86/crypto/fipsmodule/aesni-x86.asm",
9+
"generated-src/win-x86/crypto/fipsmodule/sha512-586.asm",
10+
"generated-src/win-x86/crypto/fipsmodule/co-586.asm",
11+
"generated-src/win-x86/crypto/fipsmodule/bn-586.asm",
12+
"generated-src/win-x86/crypto/fipsmodule/vpaes-x86.asm",
13+
"generated-src/win-x86/crypto/fipsmodule/ghash-ssse3-x86.asm",
14+
"generated-src/win-x86/crypto/fipsmodule/ghash-x86.asm",
15+
"generated-src/win-x86/crypto/fipsmodule/md5-586.asm",
16+
"generated-src/win-x86/crypto/fipsmodule/x86-mont.asm",
17+
"generated-src/win-x86/crypto/fipsmodule/sha1-586.asm",
18+
];

‎aws-lc-sys/builder/cc_builder/win_x86_64.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
// SPDX-License-Identifier: Apache-2.0 OR ISC
3+
14
pub(super) const CRYPTO_LIBRARY: &[&str] = &[
25
"generated-src/win-x86_64/crypto/chacha/chacha-x86_64.asm",
36
"generated-src/win-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.asm",

0 commit comments

Comments
 (0)