Add DragonFly bootstrap support (ltsmaster) by dkgroot · Pull Request #2461 · ldc-developers/ldc

dkgroot · 2017-12-21T17:51:17Z

Note: This port only supports 64-bit, because DragonFlyBSD is currently x86_64 only (i386 support removed a while back).

Related PR's:

ldc
- ldc:ltsmaster
- druntime:ltsmaster
- phobos:ltsmaster
- dmd-testsuite:ltsmaster
dlang:
- dlang/dmd:master
- dlang/druntime:master
- dlang/phobos:master (merged already)

dkgroot · 2017-12-21T19:51:38Z

Current status (Together with the other related PR's :

mkdir build; cd build
cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=None -DD_FLAGS="-w" -DLLVM_CONFIG=/usr/local/bin/llvm-config38 ..
...
make -j2 
...
make -j2 test
...
100% tests passed, 0 tests failed out of 663
Total Test time (real) = 2669.35 sec

kinke · 2017-12-21T20:00:00Z

tests/d2/CMakeLists.txt

    # given set of flags without trying all combinations of them.
    add_test(NAME ${name}
-        COMMAND make -k -C ${PROJECT_SOURCE_DIR}/tests/d2/dmd-testsuite RESULTS_DIR=${outdir} DMD=$<TARGET_FILE:ldmd2> DFLAGS=${dflags} MODEL=${model} quick
+        COMMAND ${CMAKE_MAKE_PROGRAM} -k -C ${PROJECT_SOURCE_DIR}/tests/d2/dmd-testsuite RESULTS_DIR=${outdir} DMD=$<TARGET_FILE:ldmd2> DFLAGS=${dflags} MODEL=${model} quick


As Travis shows, ninja as CMAKE_MAKE_PROGRAM doesn't accept -k without numeric argument. It's also not able to run Makefiles.

@kinke Thanks for pointing out the issue. Hoping this solves the issue, nicely.

ci/cicleci seems to be doing the right thing now
I think semaphoreci is failing because it is expecting to run against ldc:master and ltsmaster. The CMakeList.txt it is having trouble with was not changed by this PR and unrelatd to the GNUMAKE change i made.

dkgroot · 2017-12-21T21:24:58Z

Little question: Should i be committing the updated directory links runtime/druntime and runtime/phohos, which should be pointing to the other PR's or will this cause issues during merging later on ?

kinke · 2017-12-21T22:00:09Z

It would cause inconvenience due to the 3 parallel druntime PRs; but as the submodules are still in your repo, you cannot update them here anyway until they've been merged (need to be in our respective repo).
Yeah don't worry about AppVeyor and Semaphore; the latter can sadly only be configured via web GUI (no config file in repo) and so only works for master.

dkgroot · 2017-12-21T22:43:01Z

@kinke Thanks for the reply. Will not commit the links (as per your explanation).

I thought it a good idea to split up the druntime PR to reduce the size (which was requested when the druntime master PR was pushed to dlang/druntime). It's a bit annoying to deal with when running tests, but i manage.

Locally running cmake + make and/or cmake + ninja works fine now and finishes with 0 errors, so that is pretty good news.

joakim-noah

You can take out a lot of this, only need a few of these tweaks.

joakim-noah · 2017-12-22T16:23:28Z

dmd2/cppmangle.c


 #if !IN_LLVM
-//#if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
+//#if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_DRAGONFLYBSD || TARGET_SOLARIS


Take all these TARGET_DRAGONFLYBSD additions out, as this is unused in ldc, as can be seen by the !IN_LLVM above. We could probably rip all these !IN_LLVM sections out altogether, as it's unlikely we'll ever need to sync against an updated dmd 2.068 frontend again, but certainly no reason to add to it.

joakim-noah · 2017-12-22T16:33:21Z

dmd2/mars.c

 #include <cstdarg>

-#if __linux__ || __APPLE__ || __FreeBSD__ || __OpenBSD__ || __sun
+#if __linux__ || __APPLE__ || __FreeBSD__ || __OpenBSD__  || __DragonFly__ || __sun


Almost everything after this is not compiled in because of a giant #if !IN_LLVM block starting about 5% into this file, so you can just drop all your edits below.

joakim-noah · 2017-12-22T16:34:24Z

dmd2/root/object.h


 #if !IN_LLVM
-#define POSIX (__linux__ || __APPLE__ || __FreeBSD__ || __OpenBSD__ || __sun)
+#define POSIX (__linux__ || __APPLE__ || __FreeBSD__ || __OpenBSD__ || __DragonFly__ || __sun)


Unused, take it out.

joakim-noah · 2017-12-22T16:44:35Z

dmd2/globals.h

    bool isFreeBSD;     // generate code for FreeBSD
    bool isOpenBSD;     // generate code for OpenBSD
    bool isSolaris;     // generate code for Solaris
+    bool isDragonFlyBSD;// generate code for DragonFlyBSD


Unused for almost two years now, see !IN_LLVM one line up, no need to add this.

joakim-noah · 2017-12-22T16:53:24Z

dmd2/mars.h

+        __APPLE__           Mac OSX
+        __FreeBSD__         FreeBSD
+        __OpenBSD__         OpenBSD
+        __DragonFly__       DragonFlyBSD


Sorry, missed this, think you should just remove all these comment edits in this header file. This one is obvious and the later TARGET_* stuff is unused by ldc.

Thanks Joakim for pointing these out. The use of !IN_LLVM was not clear to me. Reverting all of the above.

joakim-noah · 2017-12-27T13:27:52Z

dmd2/globals.c

 #if TARGET_WINDOS
    obj_ext  = "obj";
-#elif TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
+#elif TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_DRAGONFLYBSD || TARGET_SOLARIS


As noted before, TARGET_* are unused in ldc: note the IN_LLVM 9 lines up, which puts this in the #else, meaning it's taken out. All changes to this file can be removed.

joakim-noah · 2017-12-28T18:04:15Z

runtime/CMakeLists.txt

+if (HAVE_UNISTD_H)
+    # Needed for zlib
+    append("-DHAVE_UNISTD_H" CMAKE_C_FLAGS_RELEASE)
+endif()


Remove this and rebase, already added it.

I already rebased and the change is in.

@JohanEngelen
BTW: line 269 doesn't work well when compiling with -DCMAKE_BUILD_TYPE=xxxx other than release. It does work fine if i change it to:

append("-DHAVE_UNISTD_H" CMAKE_C_FLAGS)

Send the same comment to #2317 (which was already merged).

Johan's PR for this has been merged, you can remove your change.

Rebased again to pull fix #2475

dkgroot · 2017-12-29T15:34:02Z

@joakim-noah Thanks joakim for reviewing a approving !

dkgroot · 2017-12-31T22:44:50Z

Thanks everyone for your reviews and merging this port into ldc !
All the best wishes to you all for 2018

kinke reviewed Dec 21, 2017

View reviewed changes

joakim-noah suggested changes Dec 22, 2017

View reviewed changes

joakim-noah reviewed Dec 22, 2017

View reviewed changes

joakim-noah reviewed Dec 27, 2017

View reviewed changes

joakim-noah reviewed Dec 28, 2017

View reviewed changes

Add DragonFly support to ldc

9715ede

dkgroot force-pushed the dragonfly-ltsmaster branch from 67cc175 to 9715ede Compare December 29, 2017 10:11

joakim-noah approved these changes Dec 29, 2017

View reviewed changes

joakim-noah merged commit 6b92b88 into ldc-developers:ltsmaster Dec 31, 2017

Uh oh!

Comments

Conversation

dkgroot commented Dec 21, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dkgroot commented Dec 21, 2017

Uh oh!

kinke Dec 21, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dkgroot commented Dec 21, 2017

Uh oh!

kinke commented Dec 21, 2017

Uh oh!

dkgroot commented Dec 21, 2017

Uh oh!

joakim-noah left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

joakim-noah Dec 22, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dkgroot commented Dec 29, 2017

Uh oh!

dkgroot commented Dec 31, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

dkgroot commented Dec 21, 2017 •

edited

Loading

kinke Dec 21, 2017 •

edited

Loading

joakim-noah Dec 22, 2017 •

edited

Loading