Skip to content

Commit 1a227ab

Browse files
authored
Merge pull request #974 from swiftlang/t/b3
[llbuild3] Fix x86 compile errors/warnings
2 parents 86be587 + ca97876 commit 1a227ab

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

llbuild.xcodeproj/project.pbxproj

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11595,14 +11595,17 @@
1159511595
GCC_ENABLE_CPP_RTTI = YES;
1159611596
GCC_WARN_UNINITIALIZED_AUTOS = YES;
1159711597
GCC_WARN_UNUSED_FUNCTION = NO;
11598+
GCC_WARN_UNUSED_VARIABLE = NO;
1159811599
MACOSX_DEPLOYMENT_TARGET = 14.6;
11600+
OTHER_CFLAGS = (
11601+
"-DBLAKE3_NO_AVX512",
11602+
"-DBLAKE3_NO_SSE41",
11603+
"-DBLAKE3_NO_AVX2",
11604+
);
1159911605
OTHER_CPLUSPLUSFLAGS = (
1160011606
"$(OTHER_CFLAGS)",
1160111607
"-Wimplicit-fallthrough",
1160211608
"-Wno-deprecated-this-capture",
11603-
"-DBLAKE3_NO_AVX2",
11604-
"-DBLAKE3_NO_AVX512",
11605-
"-DBLAKE3_NO_SSE41",
1160611609
);
1160711610
USER_HEADER_SEARCH_PATHS = (
1160811611
"$(PROJECT_DIR)/include",
@@ -11626,14 +11629,17 @@
1162611629
GCC_ENABLE_CPP_RTTI = YES;
1162711630
GCC_WARN_UNINITIALIZED_AUTOS = YES;
1162811631
GCC_WARN_UNUSED_FUNCTION = NO;
11632+
GCC_WARN_UNUSED_VARIABLE = NO;
1162911633
MACOSX_DEPLOYMENT_TARGET = 14.6;
11634+
OTHER_CFLAGS = (
11635+
"-DBLAKE3_NO_AVX512",
11636+
"-DBLAKE3_NO_SSE41",
11637+
"-DBLAKE3_NO_AVX2",
11638+
);
1163011639
OTHER_CPLUSPLUSFLAGS = (
1163111640
"$(OTHER_CFLAGS)",
1163211641
"-Wimplicit-fallthrough",
1163311642
"-Wno-deprecated-this-capture",
11634-
"-DBLAKE3_NO_AVX2",
11635-
"-DBLAKE3_NO_AVX512",
11636-
"-DBLAKE3_NO_SSE41",
1163711643
);
1163811644
USER_HEADER_SEARCH_PATHS = (
1163911645
"$(PROJECT_DIR)/include",

llbuild.xcodeproj/xcshareddata/xcschemes/llbuild3Tests.xcscheme

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
ignoresPersistentStateOnLaunch = "NO"
3737
debugDocumentVersioning = "YES"
3838
debugServiceExtension = "internal"
39-
allowLocationSimulation = "YES"
40-
internalIOSLaunchStyle = "3">
39+
allowLocationSimulation = "YES">
4140
</LaunchAction>
4241
<ProfileAction
4342
buildConfiguration = "Release"

llbuild.xcodeproj/xcshareddata/xcschemes/llbuild3ThirdParty.xcscheme

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
ignoresPersistentStateOnLaunch = "NO"
4040
debugDocumentVersioning = "YES"
4141
debugServiceExtension = "internal"
42-
allowLocationSimulation = "YES"
43-
internalIOSLaunchStyle = "3">
42+
allowLocationSimulation = "YES">
4443
</LaunchAction>
4544
<ProfileAction
4645
buildConfiguration = "Release"

thirdparty/BLAKE3/c/blake3_dispatch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#endif
1616

1717
#if defined(IS_X86)
18-
static uint64_t xgetbv() {
18+
static uint64_t xgetbv(void) {
1919
#if defined(_MSC_VER)
2020
return _xgetbv(0);
2121
#else

0 commit comments

Comments
 (0)