Skip to content

Merge darwin/trunk, including libdispatch-703.1.4 Apple source drop, to swift-3.0-branch #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 81 commits into from
Aug 15, 2016
Merged

Merge darwin/trunk, including libdispatch-703.1.4 Apple source drop, to swift-3.0-branch #143

Changes from 1 commit
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
4d5eff0
Linux port of libdispatch-685 merge
dgrove-oss Jun 15, 2016
847f62b
Merge pull request #81 from dgrove-oss/linux-porting
MadCoder Jun 15, 2016
7f2a683
tweaks to preprocessor checks in libdispatch-685 Linux port
das Jun 23, 2016
10c9991
Avoid overwriting config.h with generated header
dgrove-oss Jun 17, 2016
7518545
Merge pull request #84 from dgrove-oss/gitignore_config.h
MadCoder Jun 18, 2016
31f1d2b
Eliminate dummy mach-specific functions from linux_stubs
dgrove-oss Jun 16, 2016
b11112d
Merge pull request #86 from dgrove-oss/kill_mach_task_self_on_linux
MadCoder Jun 18, 2016
b8cce96
TLS thread local storage refresh
frankeh Jun 16, 2016
c4f4e68
Merge pull request #82 from frankeh/TLS
MadCoder Jun 21, 2016
3e6e4b7
remove mach-specific thread_port macro that should not be used on linux
das Jun 23, 2016
c1f5e46
import Dispatch overlay and apinotes from swift-3.0-preview-2-branch …
das Jun 22, 2016
aee1fe5
add new overlay sourcefiles to Makefile.am (does not build)
das Jun 22, 2016
4af7cad
Merge pull request #89 from apple/das-swift3-overlay
MadCoder Jun 22, 2016
0de9c3c
Mark dispatch_source APIs that are not available on Linux as unavailable
dgrove-oss Jun 30, 2016
0c41eab
Merge pull request #96 from dgrove-oss/hide_evfilt_proc
MadCoder Jun 30, 2016
63b00aa
move DISPATCH_LINUX_UNAVAILABLE to base.h and match it with existing …
das Jul 14, 2016
05255f9
Initial Swift3 wrapping overlay for libdispatch
dgrove-oss Jun 28, 2016
acea647
Merge pull request #94 from dgrove-oss/swift3-overlay-pr1
mwwa Jul 1, 2016
c40d554
need to guard definition of _dispatch_data_destructor_munmap
das Jul 14, 2016
17b7382
avoid requiring __DISPATCH_BUILDING_SWIFT_MODULE__ macro on Linux
dgrove-oss Jul 5, 2016
47369eb
Merge pull request #97 from dgrove-oss/define-dispatch-bridging-macro…
MadCoder Jul 6, 2016
13dd2ef
missing #ifdef __has_feature
das Jul 14, 2016
f3fc317
release wrapped C objects when Swift object deinitialized
dgrove-oss Jul 5, 2016
c9c0aac
Merge pull request #98 from dgrove-oss/release-in-deinit
mwwa Jul 6, 2016
2ab938a
whitespace
das Jul 14, 2016
d3bb7e5
Linux: avoid zombie process when dispatch_main is called
dgrove-oss Jul 6, 2016
fc3a731
Merge pull request #99 from dgrove-oss/dispatch-main-zombie
MadCoder Jul 6, 2016
f3c6254
Update for SE-0112: ErrorProtocol has been renamed to Error
DougGregor Jul 12, 2016
3830f55
Merge pull request #103 from apple/nserror-bridging
DougGregor Jul 12, 2016
3bbed1b
whitespace
das Jul 14, 2016
989c9dd
Enable CF runloop support for linux
dgrove-oss Jul 7, 2016
56eb6b5
Merge pull request #101 from dgrove-oss/cf-runloop-hooks
das Jul 12, 2016
627df61
workaround CF build failure, add resolvers for new symbol, whitespace
das Jul 14, 2016
eff2273
Revert modulemaps changes from PR #94
das Jul 15, 2016
f3bfb6f
Merge libdispatch-703.1.4
das Jul 28, 2016
fa5d032
define SWIFT_CC(swift) macro for DispatchStubs
dgrove-oss Jul 15, 2016
d871b97
Merge pull request #106 from dgrove-oss/dispatch-stubs-fixme
MadCoder Jul 15, 2016
c16870e
cleanup: remove LINUX_PORT_HDD remnants from initial porting work
dgrove-oss Jul 15, 2016
2cfc71e
Merge pull request #107 from dgrove-oss/cleanup-hdd-remnants
MadCoder Jul 15, 2016
9b63963
autoconf support for selecting build variant
dgrove-oss Jul 19, 2016
927f394
Merge pull request #110 from dgrove-oss/build-variants
MadCoder Jul 19, 2016
b1bdd35
Add libkqueue as a git submodule to pick up kqueue fixes
seabaylea Jul 20, 2016
9128fb2
Merge pull request #109 from seabaylea/kqueue
MadCoder Jul 20, 2016
3088ec5
update libkqueue version to include PR-14 (kevent64 timer resolution …
dgrove-oss Jul 20, 2016
34df163
Merge pull request #112 from dgrove-oss/refresh-kqueue
MadCoder Jul 20, 2016
196c268
leverage of new kevent timer granularity functionality
frankeh Jul 20, 2016
afbcf85
Merge pull request #113 from frankeh/kevent_nsecs
MadCoder Jul 20, 2016
191a607
[Data] fix crash when creating iterator of empty DispatchData
springsup Jul 20, 2016
9e7cb39
Merge pull request #111 from karwa/master
mwwa Jul 20, 2016
4fd8252
deallocation support for DispatchData on Linux
dgrove-oss Jul 15, 2016
b31c464
Merge pull request #108 from dgrove-oss/data-destructor
mwwa Jul 21, 2016
5c303da
add dispatchMain to wrapping overlay
dgrove-oss Jul 11, 2016
89c4fe1
Merge pull request #102 from dgrove-oss/missing-dispatchMain
mwwa Jul 21, 2016
12bdffa
fix compilation error when building against old libkqueue
dgrove-oss Jul 21, 2016
6a37681
Merge pull request #114 from dgrove-oss/kevent-nsec-tweak
mwwa Jul 21, 2016
3776c2e
refresh libpwq submodule to include libpwq PR#14
dgrove-oss Jul 21, 2016
6c617c2
Merge pull request #115 from dgrove-oss/refresh-libpwq
MadCoder Jul 21, 2016
e6f5827
Update for SE-0107: Migrate Void->Raw.
atrick Jul 26, 2016
0939cb0
Merge pull request #120 from atrick/rawptr-void
atrick Jul 26, 2016
632ade4
[overlay-syncup] sync overlay changes to Linux
mwwa Jul 21, 2016
8a16704
UnsafeRawPointer fixes.
mwwa Jul 27, 2016
1493f94
Merge pull request #116 from mwwa/overlay-syncup
mwwa Jul 28, 2016
2aed5c6
Update INSTALL instructions
dgrove-oss Jul 28, 2016
cf8aae4
Merge pull request #123 from dgrove-oss/update-build-instructions
parkera Jul 28, 2016
f932a06
merge darwin/darwin-006
das Jul 29, 2016
7863301
Update libpwq for fix to race condition in libpwq's test_api
seabaylea Aug 4, 2016
758bb7f
Merge pull request #134 from seabaylea/pwq_api_test
MadCoder Aug 4, 2016
74b3743
disable dispatch_read2 due to intermittent failure
seabaylea Aug 4, 2016
f99215a
Merge pull request #135 from seabaylea/disable_read2
MadCoder Aug 4, 2016
b65aa22
SR-2309: embed BlocksRuntime in libdispatch to eliminate external dep…
dgrove-oss Aug 9, 2016
4c588e9
Merge pull request #139 from dgrove-oss/integrated-blocks-runtime
MadCoder Aug 10, 2016
310012a
Added Toolchain section in INSTALL.md
amraboelela Aug 9, 2016
1300d06
Merge pull request #138 from amraboelela/INSTALL
MadCoder Aug 10, 2016
5c17dd6
update INSTALL.md and README.md
dgrove-oss Aug 10, 2016
ae1f7e8
Merge pull request #140 from dgrove-oss/update-install-readme
MadCoder Aug 10, 2016
fe6a4bc
Merge branch 'swift-3.0-branch' into das-darwin-006-merge-swift-3.0-b…
das Aug 11, 2016
b5333f0
Merge branch 'master' into das-swift-3.0-branch-backport-134-135-139-…
das Aug 15, 2016
238daea
Merge branch 'das-swift-3.0-branch-backport-134-135-139-138-140' into…
das Aug 15, 2016
6ef4372
fixes for compilation/linking problems on linux
dgrove-oss Aug 12, 2016
754175e
xcode / autoconf plumbing to select module.modulemap file
dgrove-oss Aug 12, 2016
12e8a1b
ensure root_queues are initialized before main thread exits
dgrove-oss Aug 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge pull request #123 from dgrove-oss/update-build-instructions 
Update INSTALL instructions

Signed-off-by: Daniel A. Steffen <dsteffen@apple.com>
  • Loading branch information
@parkera @das
parkera authored and das committed Jul 29, 2016
commit cf8aae4d7163e88d882e6a5b61d6040efbb9b910
1 change: 1 addition & 0 deletions PATCHES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,3 +266,4 @@ github commits starting with 29bdc2f from
[2457fb2] APPLIED rdar://27600964
[4d58038] APPLIED rdar://27600964
[98d0a05] APPLIED rdar://27600964
[8976101] APPLIED rdar://27600964