Skip to content
This repository was archived by the owner on Feb 8, 2024. It is now read-only.

Fix issue 101 #2

Closed
wants to merge 1 commit into from
Closed

Conversation

dansanduleac
Copy link

Fix Issue 101. Now compiles, threads work on OSX Lion 10.7.4, 64-bit, compiled from ldc-developers/ldc:master.

Revert upstream "fix Issue 4854 - Regression(2.047, Mac 10.5 only) writefln Segmentation fault if no globals", which was only intended for DMD/druntime.
As noted in the conflict, some changes have remained in thread.d, but fe5ba38 makes them inactive in LDC. It might be better to undo both of them completely.

This reverts commit 73cf2c1.

Conflicts:

src/core/thread.d : kept Walter's changes but only if OsxManualTls
  maybe should remove those completely as they aren't needed for
  druntime-ldc.

…gmentation fault if no globals"

This reverts commit 73cf2c1.

Conflicts:

	src/core/thread.d : kept Walter's changes but only if OsxManualTls.
      maybe should remove those completely as they aren't needed for
      druntime-ldc.
@dnadlinger
Copy link
Member

Thanks a lot for your work – unfortunately, I had already prepared a patch.

The reason I introduced osxManualTls was minimizing the source differences to the upstream version, which we generally try to do in order to make merges easier. If the code in thread.d diverges even further (which should hopefully not be the case, considering druntime's design), just removing all the DMD-only code might be the cleaner solution indeed. As far as correctness of my commit is concerned, note that some of Walter's changes are actually to dead code (dlang#238)…

@dnadlinger dnadlinger closed this Jun 2, 2012
@dansanduleac
Copy link
Author

I get it now, yeah :) It does make sense to do that.
Thanks for pushing changes to make it work!

On 2 Jun 2012, at 16:34, David Nadlinger wrote:

Thanks a lot for your work – unfortunately, I had already prepared a patch. I introduced osxManualTls in order to minimize source differences to the upstream version, in order to make merges easier. As far as correctness is concerned, note that some of Walter's changes are actually to dead code (dlang#238)…


Reply to this email directly or view it on GitHub:
#2 (comment)

kinke pushed a commit that referenced this pull request Jan 27, 2017
a bunch of smaller improvements
thewilsonator pushed a commit to thewilsonator/druntime that referenced this pull request May 26, 2019
Attempt ldc-developers#2. (This time I won't delete the fork until *after* the PR is merged 😆
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OSX: Undefined symbols for architecture x86_64 __d_osx_image_init2
2 participants