pkgs/development/compilers/ghc: drop un-referenced patch files
This commit is contained in:
Peter Simons
parent
227697bc67
commit
8c3cc7c7c4
@ -1,19 +0,0 @@
|
|||||||
diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h
|
|
||||||
--- a/rts/LinkerInternals.h
|
|
||||||
+++ b/rts/LinkerInternals.h
|
|
||||||
@@ -303,4 +303,14 @@
|
|
||||||
# define OBJFORMAT_MACHO
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+/* In order to simplify control flow a bit, some references to mmap-related
|
|
||||||
+ definitions are blocked off by a C-level if statement rather than a CPP-level
|
|
||||||
+ #if statement. Since those are dead branches when !RTS_LINKER_USE_MMAP, we
|
|
||||||
+ just stub out the relevant symbols here
|
|
||||||
+*/
|
|
||||||
+#if !RTS_LINKER_USE_MMAP
|
|
||||||
+#define munmap(x,y) /* nothing */
|
|
||||||
+#define MAP_ANONYMOUS 0
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#endif /* LINKERINTERNALS_H */
|
|
||||||
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
diff --git a/rts/sm/Storage.c b/rts/sm/Storage.c
|
|
||||||
--- a/rts/sm/Storage.c
|
|
||||||
+++ b/rts/sm/Storage.c
|
|
||||||
@@ -1314,7 +1314,7 @@
|
|
||||||
------------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
#if (defined(arm_HOST_ARCH) || defined(aarch64_HOST_ARCH)) && defined(ios_HOST_OS)
|
|
||||||
-void sys_icache_invalidate(void *start, size_t len);
|
|
||||||
+#include <libkern/OSCacheControl.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* On ARM and other platforms, we need to flush the cache after
|
|
||||||
@@ -1327,7 +1327,7 @@
|
|
||||||
(void)exec_addr;
|
|
||||||
#elif (defined(arm_HOST_ARCH) || defined(aarch64_HOST_ARCH)) && defined(ios_HOST_OS)
|
|
||||||
/* On iOS we need to use the special 'sys_icache_invalidate' call. */
|
|
||||||
- sys_icache_invalidate(exec_addr, ((unsigned char*)exec_addr)+len);
|
|
||||||
+ sys_icache_invalidate(exec_addr, len);
|
|
||||||
#elif defined(__GNUC__)
|
|
||||||
/* For all other platforms, fall back to a libgcc builtin. */
|
|
||||||
unsigned char* begin = (unsigned char*)exec_addr;
|
|
||||||
|
|
||||||
@ -1,158 +0,0 @@
|
|||||||
diff --git a/includes/rts/OSThreads.h b/includes/rts/OSThreads.h
|
|
||||||
--- a/includes/rts/OSThreads.h
|
|
||||||
+++ b/includes/rts/OSThreads.h
|
|
||||||
@@ -15,7 +15,12 @@
|
|
||||||
#ifndef RTS_OSTHREADS_H
|
|
||||||
#define RTS_OSTHREADS_H
|
|
||||||
|
|
||||||
-#if defined(THREADED_RTS) /* to near the end */
|
|
||||||
+#if defined(HAVE_PTHREAD_H) && !defined(mingw32_HOST_OS)
|
|
||||||
+#define BUILD_OSTHREAD_POSIX
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+#if defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) /* to near end */
|
|
||||||
|
|
||||||
#if defined(HAVE_PTHREAD_H) && !defined(mingw32_HOST_OS)
|
|
||||||
|
|
||||||
@@ -205,13 +210,25 @@
|
|
||||||
void releaseThreadNode (void);
|
|
||||||
#endif // !CMINUSMINUS
|
|
||||||
|
|
||||||
-#else
|
|
||||||
+#endif /* defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) */
|
|
||||||
+
|
|
||||||
+#ifndef THREADED_RTS
|
|
||||||
+
|
|
||||||
+#ifdef ACQUIRE_LOCK
|
|
||||||
+// If we have pthreads, we pull in the threading primitives even when the RTS
|
|
||||||
+// isn't threaded, but we expect these macros to be noops on non-threaded RTS.
|
|
||||||
+
|
|
||||||
+#undef ACQUIRE_LOCK
|
|
||||||
+#undef RELEASE_LOCK
|
|
||||||
+#undef ASSERT_LOCK_HELD
|
|
||||||
+
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#define ACQUIRE_LOCK(l)
|
|
||||||
#define RELEASE_LOCK(l)
|
|
||||||
#define ASSERT_LOCK_HELD(l)
|
|
||||||
|
|
||||||
-#endif /* defined(THREADED_RTS) */
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#ifndef CMINUSMINUS
|
|
||||||
//
|
|
||||||
diff --git a/rts/posix/OSThreads.c b/rts/posix/OSThreads.c
|
|
||||||
--- a/rts/posix/OSThreads.c
|
|
||||||
+++ b/rts/posix/OSThreads.c
|
|
||||||
@@ -35,7 +35,7 @@
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#if defined(THREADED_RTS)
|
|
||||||
+#if defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX)
|
|
||||||
#include "RtsUtils.h"
|
|
||||||
#include "Task.h"
|
|
||||||
|
|
||||||
@@ -225,47 +225,6 @@
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
-int
|
|
||||||
-forkOS_createThread ( HsStablePtr entry )
|
|
||||||
-{
|
|
||||||
- pthread_t tid;
|
|
||||||
- int result = pthread_create(&tid, NULL,
|
|
||||||
- forkOS_createThreadWrapper, (void*)entry);
|
|
||||||
- if(!result)
|
|
||||||
- pthread_detach(tid);
|
|
||||||
- return result;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-void freeThreadingResources (void) { /* nothing */ }
|
|
||||||
-
|
|
||||||
-uint32_t
|
|
||||||
-getNumberOfProcessors (void)
|
|
||||||
-{
|
|
||||||
- static uint32_t nproc = 0;
|
|
||||||
-
|
|
||||||
- if (nproc == 0) {
|
|
||||||
-#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)
|
|
||||||
- nproc = sysconf(_SC_NPROCESSORS_ONLN);
|
|
||||||
-#elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF)
|
|
||||||
- nproc = sysconf(_SC_NPROCESSORS_CONF);
|
|
||||||
-#elif defined(darwin_HOST_OS)
|
|
||||||
- size_t size = sizeof(uint32_t);
|
|
||||||
- if(sysctlbyname("hw.logicalcpu",&nproc,&size,NULL,0) != 0) {
|
|
||||||
- if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0)
|
|
||||||
- nproc = 1;
|
|
||||||
- }
|
|
||||||
-#elif defined(freebsd_HOST_OS)
|
|
||||||
- size_t size = sizeof(uint32_t);
|
|
||||||
- if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0)
|
|
||||||
- nproc = 1;
|
|
||||||
-#else
|
|
||||||
- nproc = 1;
|
|
||||||
-#endif
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- return nproc;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
#if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_SETAFFINITY)
|
|
||||||
// Schedules the thread to run on CPU n of m. m may be less than the
|
|
||||||
// number of physical CPUs, in which case, the thread will be allowed
|
|
||||||
@@ -353,6 +312,51 @@
|
|
||||||
pthread_kill(id, SIGPIPE);
|
|
||||||
}
|
|
||||||
|
|
||||||
+#endif /* defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) */
|
|
||||||
+
|
|
||||||
+#if defined(THREADED_RTS)
|
|
||||||
+
|
|
||||||
+int
|
|
||||||
+forkOS_createThread ( HsStablePtr entry )
|
|
||||||
+{
|
|
||||||
+ pthread_t tid;
|
|
||||||
+ int result = pthread_create(&tid, NULL,
|
|
||||||
+ forkOS_createThreadWrapper, (void*)entry);
|
|
||||||
+ if(!result)
|
|
||||||
+ pthread_detach(tid);
|
|
||||||
+ return result;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void freeThreadingResources (void) { /* nothing */ }
|
|
||||||
+
|
|
||||||
+uint32_t
|
|
||||||
+getNumberOfProcessors (void)
|
|
||||||
+{
|
|
||||||
+ static uint32_t nproc = 0;
|
|
||||||
+
|
|
||||||
+ if (nproc == 0) {
|
|
||||||
+#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)
|
|
||||||
+ nproc = sysconf(_SC_NPROCESSORS_ONLN);
|
|
||||||
+#elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF)
|
|
||||||
+ nproc = sysconf(_SC_NPROCESSORS_CONF);
|
|
||||||
+#elif defined(darwin_HOST_OS)
|
|
||||||
+ size_t size = sizeof(uint32_t);
|
|
||||||
+ if(sysctlbyname("hw.logicalcpu",&nproc,&size,NULL,0) != 0) {
|
|
||||||
+ if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0)
|
|
||||||
+ nproc = 1;
|
|
||||||
+ }
|
|
||||||
+#elif defined(freebsd_HOST_OS)
|
|
||||||
+ size_t size = sizeof(uint32_t);
|
|
||||||
+ if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0)
|
|
||||||
+ nproc = 1;
|
|
||||||
+#else
|
|
||||||
+ nproc = 1;
|
|
||||||
+#endif
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return nproc;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
#else /* !defined(THREADED_RTS) */
|
|
||||||
|
|
||||||
int
|
|
||||||
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -437,7 +437,11 @@
|
|
||||||
else
|
|
||||||
CrossCompilePrefix=""
|
|
||||||
fi
|
|
||||||
-TargetPlatformFull="${TargetPlatform}"
|
|
||||||
+# Despite its similarity in name to TargetPlatform, TargetPlatformFull is used
|
|
||||||
+# in calls to subproject configure scripts and thus must be set to the autoconf
|
|
||||||
+# triple, not the normalized GHC triple that TargetPlatform is set to.
|
|
||||||
+# It may be better to just do away with the GHC triples all together.
|
|
||||||
+TargetPlatformFull="${target}"
|
|
||||||
AC_SUBST(CrossCompiling)
|
|
||||||
AC_SUBST(CrossCompilePrefix)
|
|
||||||
AC_SUBST(TargetPlatformFull)
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user