--- a/libgc/os_dep.c.orig
+++ b/libgc/os_dep.c
@@ -41,7 +41,7 @@
 #     else /* not 2 <= __GLIBC__ */
         /* libc5 doesn't have <sigcontext.h>: go directly with the kernel   */
         /* one.  Check LINUX_VERSION_CODE to see which we should reference. */
-#       include <asm/sigcontext.h>
+/*#       include <asm/sigcontext.h>*/
 #     endif /* 2 <= __GLIBC__ */
 #   endif
 # endif
--- a/mono/metadata/file-mmap-posix.c.orig
+++ b/mono/metadata/file-mmap-posix.c
@@ -37,6 +37,10 @@
 #include <mono/utils/mono-memory-model.h>
 #include <mono/utils/mono-mmap.h>
 
+#ifndef DEFFILEMODE
+#define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) /* 0666 */
+#endif
+
 typedef struct {
 	int kind;
 	int ref_count;
--- a/mono/unit-tests/Makefile.am.orig
+++ b/mono/unit-tests/Makefile.am
@@ -28,14 +28,9 @@
 test_mono_linked_list_set_LDADD = $(TEST_LDADD)
 test_mono_linked_list_set_LDFLAGS = $(TEST_LDFLAGS)
 
-test_conc_hashtable_SOURCES = test-conc-hashtable.c
-test_conc_hashtable_CFLAGS = $(TEST_CFLAGS)
-test_conc_hashtable_LDADD = $(TEST_LDADD)
-test_conc_hashtable_LDFLAGS = $(TEST_LDFLAGS)
+noinst_PROGRAMS = test-sgen-qsort test-gc-memfuncs test-mono-linked-list-set
 
-noinst_PROGRAMS = test-sgen-qsort test-gc-memfuncs test-mono-linked-list-set test-conc-hashtable
-
-TESTS = test-sgen-qsort test-gc-memfuncs test-mono-linked-list-set test-conc-hashtable
+TESTS = test-sgen-qsort test-gc-memfuncs test-mono-linked-list-set
 
 endif !PLATFORM_GNU
 endif SUPPORT_BOEHM