Skip to content

Merge master back into swift-3.1-branch #217

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.

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 137 commits into from
Feb 22, 2017
Merged

Merge master back into swift-3.1-branch #217

merged 137 commits into from
Feb 22, 2017

Conversation

das
Copy link
Contributor

@das das commented Feb 22, 2017

Merge master back into swift-3.1-branch to pull in
PR #200, PR #202, PR #203, PR #204, PR #205, PR #207, PR #208, PR #209, PR #210, PR #213, PR #214, PR #215, PR #216

weissi and others added 30 commits January 16, 2017 19:37
don't hold references to unowned DispatchData objects (SR-3628)
... for the cases where seconds parameter is NaN or infinite.
rdar://problem/29764171
Fix + and - operations on DispatchTime and DispatchWallTime
update libpwq and libkqueue submodule versions
…index is not 0 and adds a test for that method.

 Please enter the commit message for your changes. Lines starting
Correct the Xcode fixits for dispatch_async() and dispatch_group_async()
Revert back to libkqueue version that has the fix for
SR-2941 but does not have the changes to remove the
autotools-based build system.
Fixes incorrect behavior of DispatchData.copyBytes() when the start …
SR-3771 and SR-3751: libdispatch should not depend on external libkqueue
…Pointer<Uint8> with a nil address."

This reverts commit 86860b5 (fix should have been made in a branch)
Fixes crash when DispatchData is created from an UnsafeBufferPointer<UInt8> with a nil address (Radar 29337927)
The static version (`libdispatch.a`) that can be compiled using
`./configure --enable static=yes` was missing all the Swift overlay symbols
(everything in `swift_overlay.o`). The reason for that is that the linker is
invoked through libtool which wants `.lo` files but the Swift overlay got passed
as a `.o` file. This first of all leads to this warning:

    *** Warning: Linking the shared library libdispatch.la against the non-libtool
    *** objects [...]/swift_overlay.o is not portable!

And the result is that libtool doesn't include `swift_overlay.o` when putting
together the static library `libdispatch.a`.

This patch fixes this problem is a pretty crude way. The real problem is that
libtool doesn't understand Swift. So it can't be used when compiling
`swift_overlay.o`. In order to still get a `.lo` file this patch tricks libtool
into generating one from the `swift_overlay.o` generated by `swiftc`. It's very
hacky but I'm not sure what else to do.
Adding documentation to clarify the result of DispatchTime(uptimeNanoseconds: 0)
Remove ObjC support functions not needed on non-ObjC platforms
The include of sys/user.h is not needed; it
is a leftover from the initial linux port.
Eliminating it avoids a build problem for
the Swift dispatch overlay on ubuntu 14.04
powerpc64le because the content of sys/user.h
confuses the clang module importer when it
attempts to import CDispatch.
Remove unused include of sys/user.h
fix libdispatch.a to include Swift overlay symbols
[SE-0111] Update for removal of argument labels from function types

Signed-off-by: Daniel A. Steffen <[email protected]>
Signed-off-by: Daniel A. Steffen <[email protected]>
Max Moiseev and others added 28 commits February 20, 2017 18:47
... for the cases where seconds parameter is NaN or infinite.
rdar://problem/29764171

Signed-off-by: Daniel A. Steffen <[email protected]>
Fix + and - operations on DispatchTime and DispatchWallTime

Signed-off-by: Daniel A. Steffen <[email protected]>
update libpwq and libkqueue submodule versions

Signed-off-by: Daniel A. Steffen <[email protected]>
…c().

rdar://problem/27915073

Signed-off-by: Daniel A. Steffen <[email protected]>
Correct the Xcode fixits for dispatch_async() and dispatch_group_async()

Signed-off-by: Daniel A. Steffen <[email protected]>
…index is not 0 and adds a test for that method.

 Please enter the commit message for your changes. Lines starting

Signed-off-by: Daniel A. Steffen <[email protected]>
Fixes incorrect behavior of DispatchData.copyBytes() when the start …

Signed-off-by: Daniel A. Steffen <[email protected]>
Revert back to libkqueue version that has the fix for
SR-2941 but does not have the changes to remove the
autotools-based build system.

Signed-off-by: Daniel A. Steffen <[email protected]>
SR-3771 and SR-3751: libdispatch should not depend on external libkqueue

Signed-off-by: Daniel A. Steffen <[email protected]>
…Uint8> with a nil address.

Radar 29337927

Signed-off-by: Daniel A. Steffen <[email protected]>
Fixes crash when DispatchData is created from an UnsafeBufferPointer<UInt8> with a nil address (Radar 29337927)

Signed-off-by: Daniel A. Steffen <[email protected]>
…seconds: 0)

(Radar 28814085)
(SR-2807)

Signed-off-by: Daniel A. Steffen <[email protected]>
Adding documentation to clarify the result of DispatchTime(uptimeNanoseconds: 0)

Signed-off-by: Daniel A. Steffen <[email protected]>
Remove ObjC support functions not needed on non-ObjC platforms

Signed-off-by: Daniel A. Steffen <[email protected]>
The include of sys/user.h is not needed; it
is a leftover from the initial linux port.
Eliminating it avoids a build problem for
the Swift dispatch overlay on ubuntu 14.04
powerpc64le because the content of sys/user.h
confuses the clang module importer when it
attempts to import CDispatch.

Signed-off-by: Daniel A. Steffen <[email protected]>
Remove unused include of sys/user.h

Signed-off-by: Daniel A. Steffen <[email protected]>
Signed-off-by: Daniel A. Steffen <[email protected]>
Signed-off-by: Daniel A. Steffen <[email protected]>
Signed-off-by: Daniel A. Steffen <[email protected]>
Collection of small fixes to dispatch-806 merge to
allow code to compile/link/run on Linux.
…rge-master-linux-fixes

Linux fixes for dispatch-806 merge
…aster

Merge darwin/libdispatch-806 to master and apply Linux build fixes
@das
Copy link
Contributor Author

das commented Feb 22, 2017

Per discussion in #215

@das das merged commit b05f41d into swift-3.1-branch Feb 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.