Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in
SWIFTsim
SWIFTsim
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 72
    • Issues 72
    • List
    • Boards
    • Labels
    • Milestones
  • Merge Requests 14
    • Merge Requests 14
  • Analytics
    • Analytics
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
  • SWIFT
  • SWIFTsimSWIFTsim
  • Merge Requests
  • !715

Open
Opened Jan 11, 2019 by Aidan Chalk@d74ksy
  • Report abuse
Report abuse

WIP: C11 atomics update

  • Overview 9
  • Commits 38
  • Changes 34

Merge request for C11 atomics version. Creating this early so ongoing reviewing/discussion/testing is easier.

Current version has implementations of the atomic functions we need with C11, however I've not tested them inside swift as various types need changing still.

It is based on Matthieu's previous C11 work, which has been rebased to current master, and also has Matthieu and Peter's atomic changes.

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b "c11_atomics_copy" "origin/c11_atomics_copy"

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "origin/master"
git merge --no-ff "c11_atomics_copy"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: swift/swiftsim!715