Skip to content

Commit ffdb4a6

Browse files
committed
libdispatch: enable building for x86
This is now supported due to our patch for using our own BlocksRuntime.
1 parent b3e335f commit ffdb4a6

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ As support for using GNUstep with the MSVC ABI has only been recently added, and
9595

9696
Following is a list of some of the open items.
9797

98-
- [ ] Add support for building libdispatch for x86 (currently blocked by [libdispatch build issue](https://bugs.swift.org/browse/SR-14314))
9998
- [ ] Figure out building Objective-C code in Visual Studio
10099
- [ ] Fix tests in GNUstep Base
101100
- [ ] Provide pre-built binaries

patches/libdispatch-fix-stdcall.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/src/shims/tsd.h b/src/shims/tsd.h
2+
index 446c4d7..f8b5ec9 100644
3+
--- a/src/shims/tsd.h
4+
+++ b/src/shims/tsd.h
5+
@@ -158,7 +158,7 @@ struct dispatch_tsd {
6+
extern _Thread_local struct dispatch_tsd __dispatch_tsd;
7+
8+
extern void libdispatch_tsd_init(void);
9+
-extern void _libdispatch_tsd_cleanup(void *ctx);
10+
+extern void DISPATCH_TSD_DTOR_CC _libdispatch_tsd_cleanup(void *ctx);
11+
12+
DISPATCH_ALWAYS_INLINE
13+
static inline struct dispatch_tsd *

phases/18-libdispatch.bat

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ set TAG=
88
:: load environment and prepare project
99
call "%~dp0\..\scripts\common.bat" prepare_project || exit /b 1
1010

11-
if "%ARCH%" == "x86" (
12-
echo Skipping libdispatch for x86
13-
echo Blocked on issue: https://bugs.swift.org/browse/SR-14314
14-
exit /b 0
15-
)
16-
1711
set BUILD_DIR="%SRCROOT%\%PROJECT%\build-%ARCH%-%BUILD_TYPE%"
1812
if exist "%BUILD_DIR%" (rmdir /S /Q "%BUILD_DIR%" || exit /b 1)
1913
mkdir "%BUILD_DIR%" || exit /b 1

0 commit comments

Comments
 (0)