Skip to content
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

Mono Bleeding Edge for Trunk #776

Merged
merged 131 commits into from
Jan 2, 2018
Merged
Show file tree
Hide file tree
Changes from 130 commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
1057d03
System.Web.SessionState: simplify sessions retrival polling
Dec 11, 2014
4b2d74f
[runtime] Remove overridable allocator flag
alexanderkyte Oct 2, 2017
27d68ce
[runtime] Bring jemalloc to mono
alexanderkyte Sep 21, 2017
df86ddf
[dontmerge/forjenkins] Always enable jemalloc, so CI builds with enab…
alexanderkyte Oct 4, 2017
07d07ad
[wasm] Switch to an incremental nunit test runner to make sure the ma…
kumpera Nov 4, 2017
88e9d00
[corlib] Add wasm source lists for test suite.
kumpera Nov 7, 2017
7cb492d
[util] Properly Initialize the last entry of a superblock instead of …
kumpera Nov 9, 2017
0d6f22f
[wasm] Mono relies waaaay too much on mmap returning zero'ed memory, …
kumpera Nov 9, 2017
fed2587
[wasm] Return actual stack bounds instead of phony values.
kumpera Nov 9, 2017
48c111e
[wasm] Add better implementation of mono_w32file_get_volume_information.
kumpera Nov 9, 2017
d9224b1
[interp] Make assertions more usable.
kumpera Nov 9, 2017
cb8d515
[wasm] Update the wasm m2n tramps.
kumpera Nov 9, 2017
9e8a648
[wasm] Build the runtime with ASSERTIONS=2 for now to get better cras…
kumpera Nov 9, 2017
426109e
[wasm] Rework incremental test runner to work more closely to how nun…
kumpera Nov 9, 2017
c8ed7a1
[wasm] Current version of libc abort on getpwnam.
kumpera Nov 10, 2017
0d10ad9
[wasm] clock_gettime fails on with EINVAL. gtod works just fine.
kumpera Nov 10, 2017
3d80b0b
[wasm] Don't abort on thread creation, simply fail it.
kumpera Nov 10, 2017
04d0d02
[sdks] Remove debug spew from new nunit driver and add option to run …
kumpera Nov 10, 2017
1b9e3ec
[sdks] Add code to run corlib test suite.
kumpera Nov 10, 2017
82e9c5c
[sdks] Adjust debug spew to help debug GC issues.
kumpera Nov 10, 2017
9a143f9
[wasm] Fix signature of Monitor::Enter icall.
kumpera Nov 17, 2017
937fcd1
[wasm] Unbreak EH
kumpera Nov 17, 2017
6549011
[wasm] Address review issues.
kumpera Nov 21, 2017
8e09c45
[wasm] Rewrite m2n-gen in C#
kumpera Nov 21, 2017
2ab06be
[profiler] Make it possible to trigger heapshots from the M.P.L library.
Nov 27, 2017
82151ac
[corlib] Adds Span/Memory tests
marek-safar Oct 17, 2017
3b00c67
Bump API snapshot submodule
monojenkins Nov 27, 2017
6be02ed
Don't run System.Runtime.CompilerServices.Unsafe tests due to JIT cra…
marek-safar Nov 27, 2017
ea10d2f
Bump API snapshot submodule
monojenkins Nov 27, 2017
87500ea
[profiler] Improve nodefaults usage.
kumpera Nov 27, 2017
f5fc773
[w32handle] Pass MonoW32Handle to more places (#5570)
luhenry Nov 28, 2017
b3fad3f
[msvc] Update csproj files
monojenkins Nov 28, 2017
0927d51
[runtime] Implement a few ModuleBuilder getters (#5787)
alexanderkyte Nov 28, 2017
eb11cee
Bump msbuild to xplat-master branch
akoeplinger Nov 28, 2017
afea7b6
[System] Add corefx tests for System.CodeDom (#5623)
EgorBo Nov 28, 2017
ccc1bd2
[aot] add more signatures for interp_in wrapper needed for iOS
lewurm Nov 27, 2017
fcfaf09
[interp] fix copy/paste-typo in n2m macro magic
lewurm Nov 27, 2017
7ed2c02
[aot] encode interp_in wrappers with proper signature
lewurm Nov 27, 2017
c92f638
[interp] small improvment for error reporting in interp compile metho…
lewurm Nov 27, 2017
8d487ae
Bump bockbuild to upgrade expat library (#6093)
akoeplinger Nov 28, 2017
832e161
[profiler] Add thread_stopping and thread_exited profiler events.
Nov 28, 2017
cd46e14
[profiler] Use thread_exited profiler event for recording thread end …
Nov 28, 2017
22d22ff
[profiler] Remove tools_thread checks when raising profiler thread ev…
Nov 28, 2017
c36f5af
[profiler] Add an assertion to the log profiler to catch the thread r…
Nov 28, 2017
8d1ef54
[ci] Skip System.Runtime.CompilerServices.Unsafe tests on arm32 too
akoeplinger Nov 28, 2017
38cc502
[ci] Make bockbuild step fatal for run-test-mac-sdk.sh
alexischr Nov 28, 2017
b4eb34d
Merge pull request #6121 from akoeplinger/bump-msbuild
alexischr Nov 28, 2017
58d94f4
[loader] Don't assert on abstract methods in get_method_constrained (…
lambdageek Nov 28, 2017
c79c456
Merge pull request #6043 from kumpera/wasm-p2
kumpera Nov 28, 2017
425c62c
[interp] disassembler for mint instructions should return a string in…
lewurm Nov 29, 2017
33afa19
[mcs] Implements C#7.1 default literal
marek-safar Nov 27, 2017
c5d3bf2
[msvc] Update csproj files (#6131)
monojenkins Nov 29, 2017
370fd7b
un-commented HmacSha256Signature bug 35661
oddball Nov 29, 2017
8049799
Merge pull request #6110 from alexrp/master
kumpera Nov 29, 2017
0c88bc2
Merge pull request #6115 from alexrp/profiler-lls-fix
kumpera Nov 29, 2017
0239710
[profiler] Ensure the profilers behave sensibly when loaded during AO…
Nov 28, 2017
2bd75f8
Outset and SingleHorizontal border styles fixed
YuriyGS Nov 30, 2017
0c873d2
AdjustCellBorderStyle - implemented edge/non-edge header/non-header r…
YuriyGS Nov 30, 2017
384a163
Drawing row & column divider and take it into account for drawing bor…
YuriyGS Nov 30, 2017
be6c2af
Additional cell paddings in TextBoxCell:
YuriyGS Nov 30, 2017
26de079
[profiler] Correctly encode counter type/unit/variance values.
Nov 30, 2017
73c6a2e
Merge pull request #6135 from YuriyGS/DataGridViewCell-Border
alexischr Nov 30, 2017
dcbc55c
[msvc] Update csproj files (#6137)
monojenkins Nov 30, 2017
9c2c689
Mini h cleanup (#6072)
vargaz Nov 30, 2017
3635db2
Cleanup unused MONO_DISABLE_SHM env var (#6141)
markusbeth Dec 1, 2017
c8bf8c2
[runtime] Replace the C and perl versions of the genmdesc tool wi…
vargaz Dec 1, 2017
225071a
[llvm] Fix the build. (#6142)
vargaz Dec 1, 2017
c12b749
Merge pull request #6134 from alexrp/master
alexrp Dec 1, 2017
f408d2c
[log] Rework MONO_TRACE_* to allow for nested io-layer masks (process…
luhenry Dec 1, 2017
13d221b
[mini] Add missing try holes
BrzVlad Nov 29, 2017
f079d5f
[interp] move interp functions into a callback
lewurm Dec 1, 2017
465e203
[w32handle] Don't enter GC SAFE around calls to w32handle_wait_{one,m…
lambdageek Dec 1, 2017
ce96441
[mem access] don't do regular store if it's already handled by the un…
lewurm Dec 1, 2017
f714138
[acceptance-tests] Disable the msbiology test completely.
Dec 2, 2017
0ae9853
Merge pull request #6148 from alexrp/profiler-stress-msbiology
monojenkins Dec 2, 2017
e2e34c1
[linker-analyzer] Fix error reporting
radekdoulik Dec 2, 2017
d107f08
[jit] Fix the DISABLE_JIT build. (#6152)
vargaz Dec 3, 2017
5bdaef7
[runtime] Add support for weak fields. (#5972)
vargaz Dec 3, 2017
2bab8fa
[Profiler] Fix parsing bug when `jit` is enabled
DavidKarlas Dec 3, 2017
db05a25
[llvm] Update the llvm backend to work with the 2017-12-01-31d7f39423…
vargaz Dec 4, 2017
a21fb19
[mcs] Don't emit tuple names for a private types
marek-safar Dec 4, 2017
58618de
[tests] Disable weak-fields.exe on ARM
akoeplinger Dec 4, 2017
cd5f528
Bump version to 5.11 (#6158)
akoeplinger Dec 4, 2017
399c2c8
[tests] Disable weak-fields.exe on FullAOT as well
akoeplinger Dec 4, 2017
6a867bd
[linker-analyzer] added --flat option (#5629)
radekdoulik Dec 5, 2017
67c9ed3
README.md: point at GitHub Issues
lambdageek Dec 5, 2017
63a49e9
[runtime] Fix OSX 32-bit build definition
alexanderkyte Oct 26, 2017
50b6a2e
Fix genproj.cs (make update-solution-files) (#6162)
EgorBo Dec 5, 2017
3dac926
Merge pull request #5643 from alexanderkyte/jemalloc
alexischr Dec 5, 2017
233212b
Revert "Merge pull request #5643 from alexanderkyte/jemalloc"
alexischr Dec 5, 2017
657ff6d
[msvc] Update csproj files (#6163)
monojenkins Dec 5, 2017
b683e10
[runtime] Thread MonoError through mono_class_get_overrides_full. (#6…
kumpera Dec 6, 2017
5a581fb
Compile on amd64 Haiku (#4473)
NattyNarwhal Dec 6, 2017
4d5d54f
[interp] disable weak-fields.exe (#6191)
lewurm Dec 7, 2017
d7ac79c
[profiler] Rework GC roots reporting. (#6144)
alexrp Dec 7, 2017
1724ce2
[mcs] Add a detection for ByRefLikeMarker (#6195)
marek-safar Dec 7, 2017
8be2726
Add install of Visual Basic compiler (#6127)
slide Dec 7, 2017
27790b9
Bump roslyn-binaries submodule
akoeplinger Dec 7, 2017
dd34edb
Bump roslyn-binaries submodule
akoeplinger Dec 7, 2017
7758f54
Merge pull request #1450 from echampet/session
alexischr Dec 8, 2017
2b90049
[msvc] Update csproj files (#6206)
monojenkins Dec 8, 2017
4f6e01e
Create ISSUE_TEMPLATE.md
migueldeicaza Dec 11, 2017
2d43cf6
Add issue template
marek-safar Dec 11, 2017
1e3fb99
[threads] Fix leak of gchandle to MonoInternalThread
luhenry Dec 8, 2017
da807f6
[mcs] Propagate flow analysis for tuple deconstruct
marek-safar Dec 11, 2017
5ec0243
[aot] Fix aot+llvm after the weak field changes.
vargaz Dec 13, 2017
19cba1d
[interp] Fix build when disabled (#6218)
luhenry Dec 13, 2017
aeceaa7
Merge pull request #6203 from luhenry/fix-6169
kumpera Dec 13, 2017
e5fa0b7
Merge pull request #6234 from vargaz/llvm-weak-fields
kumpera Dec 13, 2017
c906903
No mem needs (#6210)
vargaz Dec 13, 2017
2aadbf1
[s390x] Fix errors in cpu-s390x.md which are exposed by the new genmd…
vargaz Dec 13, 2017
f928785
[mini] isalnum() respects encoding in python3, we only want to have A…
lewurm Dec 13, 2017
746a3d0
[corlib] rename NotWorkingInterpreter and InterpreterNotWorking categ…
lewurm Dec 13, 2017
7bf60c3
[build] Redirect api build to reference-assemblies
marek-safar Dec 12, 2017
c593c1e
[mkbundle] Bundle unmanaged libs
directhex Dec 12, 2017
1b1ba67
[wasm] Disable mini test that fails due to the interpreter
kumpera Nov 17, 2017
198a7c6
[wasm] Pass the name of the test suite to the test driver. Disable ru…
kumpera Nov 17, 2017
d5ebaad
[wasm] Move runtime background pumping to utils and make it work with…
kumpera Nov 21, 2017
7ac259d
[wasm] Implement a wasm specific threadpool worker.
kumpera Nov 21, 2017
4ad5fc6
[corlib] Mark tests that requires multiple threads with the "MultiThr…
kumpera Nov 21, 2017
f08f228
[wasm] Add comment to generated file that is was... generated.
kumpera Nov 28, 2017
9eecae8
[wasm] Run finalizers from a background task.
kumpera Nov 28, 2017
68eb7bc
[wasm] Update corlib testsuite to disable multi-threaded tests.
kumpera Nov 28, 2017
f3e04b1
[wasm] Fix runtime compilation. Fixes by Kenneth Pouncey
kumpera Dec 12, 2017
76d7ab2
[Mono.Profiler.Log] Fix reading of TYPE_JITHELPER events for < v14.
Dec 13, 2017
5778842
Fix TimeZoneInfo local time on platforms that do not have tzdata
joncham Dec 20, 2017
37431de
Ensure mono_gc_dllmain always returns a value.
joncham Dec 21, 2017
b7052c0
Disable incremental link for release builds. This causes native stack…
joncham Dec 21, 2017
97587c8
Merge commit '76d7ab2' into unity-master-staging-merge2
joncham Dec 28, 2017
cae4850
Merge pull request #774 from Unity-Technologies/unity-master-staging-…
joncham Jan 1, 2018
37ff3f5
IL2CPP debugger fixes for working with Unity players (#772)
Jan 2, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
File renamed without changes.
30 changes: 30 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
## Steps to Reproduce

1.
2.
3.

## Current Behavior

What is the current behavior?

## Expected Behavior

Please describe the behavior you are expecting

### On which platforms did you notice this

- [ ] macOS
- [ ] Linux
- [ ] Windows

**Version Used**:

You can use `mono --version` or About dialog to obtain this information

### Stacktrace

```
Please copy paste the Stacktrace here if available
```

13 changes: 1 addition & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,7 @@ section.
Reporting bugs
==============

To submit bug reports, please use [Xamarin's
Bugzilla](https://bugzilla.xamarin.com/)
To submit bug reports, please [open an issue on the mono GitHub repo](https://github.com/mono/mono/issues/new).

Please use the search facility to ensure the same bug hasn't already
been submitted and follow our
Expand Down Expand Up @@ -358,16 +357,6 @@ should be used.

* Or you can specify a path to a libgdiplus.

* `--disable-shared-memory`

* Use this option to disable the use of shared memory in
Mono (this is equivalent to setting the MONO_DISABLE_SHM
environment variable, although this removes the feature
completely).

* Disabling the shared memory support will disable certain
features like cross-process named mutexes.

* `--enable-minimal=LIST`

* Use this feature to specify optional runtime
Expand Down
37 changes: 12 additions & 25 deletions acceptance-tests/profiler-stress/runner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,16 @@ static class Program {
static readonly TimeSpan _timeout = TimeSpan.FromHours (9);

static readonly Dictionary<string, Predicate<Benchmark>> _filters = new Dictionary<string, Predicate<Benchmark>> {
{ "ironjs-v8", FilterArmArchitecture },
{ "ironjs-v8", FilterNotOnArm },
{ "msbiology", FilterNever },
};

static readonly Dictionary<string, Action<TestResult>> _processors = new Dictionary<string, Action<TestResult>> {
{ "msbiology", Process32BitOutOfMemory },
};

static string FilterInvalidXmlChars (string text) {
return Regex.Replace (text, @"[^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD\u10000-\u10FFFF]", string.Empty);
static bool FilterNever (Benchmark benchmark)
{
return false;
}

static bool FilterArmArchitecture (Benchmark benchmark)
static bool FilterNotOnArm (Benchmark benchmark)
{
#if ARCH_arm || ARCH_arm64
return false;
Expand All @@ -80,23 +78,15 @@ static bool FilterArmArchitecture (Benchmark benchmark)
#endif
}

static void Process32BitOutOfMemory (TestResult result)
{
if (Environment.Is64BitProcess)
return;

if (result.ExitCode == null || result.ExitCode == 0)
return;

if (result.StandardError.Contains ("OutOfMemoryException"))
result.ExitCode = 0;
}

static bool IsSupported (Benchmark benchmark)
{
return _filters.TryGetValue (benchmark.Name, out var filter) ? filter (benchmark) : true;
}

static string ReplaceInvalidXmlChars (string text) {
return Regex.Replace (text, @"[^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD\u10000-\u10FFFF]", string.Empty);
}

static int Main ()
{
var depDir = Path.Combine ("..", "external", "benchmarker");
Expand Down Expand Up @@ -227,9 +217,6 @@ static int Main ()
Console.WriteLine (result.StandardError);
}

if (_processors.TryGetValue (bench.Name, out var processor))
processor (result);

results.Add (result);
}

Expand Down Expand Up @@ -307,11 +294,11 @@ static int Main ()
writer.WriteStartElement ("failure");

writer.WriteStartElement ("message");
writer.WriteCData (FilterInvalidXmlChars (result.StandardOutput));
writer.WriteCData (ReplaceInvalidXmlChars (result.StandardOutput));
writer.WriteEndElement ();

writer.WriteStartElement ("stack-trace");
writer.WriteCData (FilterInvalidXmlChars (result.StandardError));
writer.WriteCData (ReplaceInvalidXmlChars (result.StandardError));
writer.WriteEndElement ();

writer.WriteEndElement ();
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
#AC_PREREQ([2.62])

AC_INIT(mono, [5.9.0],
AC_INIT(mono, [5.11.0],
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])

AC_CONFIG_SRCDIR([README.md])
Expand Down Expand Up @@ -123,6 +123,7 @@ CFLAGS="$CFLAGS -D_REENTRANT -D_GNU_SOURCE -DNO_UNALIGNED_ACCESS -s WASM=1"
CPPFLAGS="$CPPFLAGS -D_REENTRANT -DUSE_MMAP -D_GNU_SOURCE -DNO_UNALIGNED_ACCESS -s WASM=1"
libdl="-ldl"
libgc_threads=pthreads
platform_wasm=yes

else

Expand Down Expand Up @@ -368,8 +369,6 @@ case "$host" in
AC_DEFINE(PTHREAD_POINTER_ID)
dnl Haiku does not support static TLS with __thread
with_tls=pthread
dnl Boehm is too much work to backport Haiku support for
support_boehm=no
libgc_threads=pthreads
use_sigposix=yes
;;
Expand Down Expand Up @@ -413,6 +412,7 @@ AM_CONDITIONAL(HOST_SIGPOSIX, test x$use_sigposix = xyes)
AM_CONDITIONAL(HOST_ANDROID, test x$platform_android = xyes)
AM_CONDITIONAL(HOST_TIZEN, test x$platform_tizen = xyes)
AM_CONDITIONAL(HOST_IOS, test x$platform_ios = xyes)
AM_CONDITIONAL(HOST_WASM, test x$platform_wasm = xyes)

if test -z "$HOST_DARWIN_TRUE"; then :
PLATFORM_AOT_SUFFIX=.dylib
Expand Down
2 changes: 1 addition & 1 deletion external/bockbuild
Submodule bockbuild updated 1 files
+2 −1 packages/expat.py
4 changes: 4 additions & 0 deletions libgc/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ case "$THREADS" in
AC_DEFINE(GC_AIX_THREADS)
AC_DEFINE(_REENTRANT)
;;
*-*-haiku*)
AC_DEFINE(GC_HAIKU_THREADS)
AC_DEFINE(_REENTRANT)
;;
*-*-hpux*)
AC_MSG_WARN("Only HP/UX 11 threads are supported.")
AC_DEFINE(GC_HPUX_THREADS)
Expand Down
19 changes: 18 additions & 1 deletion libgc/dyn_load.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
!(defined(FREEBSD) && defined(__ELF__)) && \
!(defined(OPENBSD) && (defined(__ELF__) || defined(M68K))) && \
!(defined(NETBSD) && defined(__ELF__)) && !defined(HURD) && \
!defined(DARWIN)
!defined(DARWIN) && !defined(HAIKU)
--> We only know how to find data segments of dynamic libraries for the
--> above. Additional SVR4 variants might not be too
--> hard to add.
Expand Down Expand Up @@ -1258,6 +1258,23 @@ GC_bool GC_register_main_static_data()

#endif /* DARWIN */

#if defined(HAIKU)

#include <kernel/image.h>

void GC_register_dynamic_libraries()
{
image_info info;
int32 cookie = 0;
while (get_next_image_info(0, &cookie, &info) == B_OK)
{
void *data = info.data;
GC_add_roots_inner(data, data + info.data_size, TRUE);
}
}

#endif /* HAIKU */

#else /* !DYNAMIC_LOADING */

#ifdef PCR
Expand Down
2 changes: 1 addition & 1 deletion libgc/include/gc_config_macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
defined(GC_HPUX_THREADS) || defined(GC_OSF1_THREADS) || \
defined(GC_DGUX386_THREADS) || defined(GC_DARWIN_THREADS) || \
defined(GC_AIX_THREADS) || defined(GC_NETBSD_THREADS) || \
defined(GC_OPENBSD_THREADS) || \
defined(GC_OPENBSD_THREADS) || defined(GC_HAIKU_THREADS) ||\
(defined(GC_WIN32_THREADS) && defined(__CYGWIN32__))
# define GC_PTHREADS
# endif
Expand Down
33 changes: 32 additions & 1 deletion libgc/include/private/gcconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,16 @@
# define BEOS
# define mach_type_known
# endif
# if defined(__HAIKU__) && defined(_X86_)
# define I386
# define HAIKU
# define mach_type_known
# endif
# if defined(__HAIKU__) && defined(__amd64__)
# define X86_64
# define HAIKU
# define mach_type_known
# endif
# if defined(LINUX) && (defined(i386) || defined(__i386__))
# define I386
# define mach_type_known
Expand Down Expand Up @@ -1164,6 +1174,15 @@
extern int etext[];
# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
# endif
# ifdef HAIKU
# define OS_TYPE "HAIKU"
# include <OS.h>
# define GETPAGESIZE() B_PAGE_SIZE
extern int etext[];
# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
# define DYNAMIC_LOADING
# define MPROTECT_VDB
# endif
# ifdef SUNOS5
# define OS_TYPE "SUNOS5"
extern int _etext[], _end[];
Expand Down Expand Up @@ -2134,6 +2153,15 @@
/* There seems to be some issues with trylock hanging on darwin. This
should be looked into some more */
# endif
# ifdef HAIKU
# define OS_TYPE "HAIKU"
# include <OS.h>
# define GETPAGESIZE() B_PAGE_SIZE
extern int etext[];
# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
# define DYNAMIC_LOADING
# define MPROTECT_VDB
# endif
# ifdef FREEBSD
# define OS_TYPE "FREEBSD"
# ifndef GC_FREEBSD_THREADS
Expand Down Expand Up @@ -2251,7 +2279,7 @@
# if defined(SVR4) || defined(LINUX) || defined(IRIX5) || defined(HPUX) \
|| defined(OPENBSD) || defined(NETBSD) || defined(FREEBSD) \
|| defined(DGUX) || defined(BSD) || defined(SUNOS4) \
|| defined(_AIX) || defined(DARWIN) || defined(OSF1)
|| defined(_AIX) || defined(DARWIN) || defined(OSF1) || defined(HAIKU)
# define UNIX_LIKE /* Basic Unix-like system calls work. */
# endif

Expand Down Expand Up @@ -2507,6 +2535,9 @@
# if defined(SN_TARGET_PS3)
extern void *ps3_get_mem (size_t size);
# define GET_MEM(bytes) (struct hblk*) ps3_get_mem (bytes)
# elif defined(HAIKU)
ptr_t GC_haiku_get_mem(GC_word bytes);
# define GET_MEM(bytes) (struct hblk*)GC_haiku_get_mem(bytes)
# else
extern ptr_t GC_unix_get_mem(word size);
# define GET_MEM(bytes) (struct hblk *)GC_unix_get_mem(bytes)
Expand Down
Loading