[Git][ghc/ghc][wip/rts-configure-2] More stuff

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch wip/rts-configure-2 at Glasgow Haskell Compiler / GHC


Commits:
31095b1e by Ben Gamari at 2022-11-04T17:07:59-04:00
More stuff

- - - - -


5 changed files:

- rts/configure.ac
- rts/include/rts/PosixSource.h
- rts/linker/Elf.c
- rts/linker/elf_got.c
- rts/posix/ticker/Pthread.c


Changes:

=====================================
rts/configure.ac
=====================================
@@ -28,10 +28,13 @@ AC_CONFIG_HEADERS([include/ghcautoconf.h])
 # results in the following code
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
 
-dnl GHC_CONVERT_PLATFORM_PARTS([host], [Host])
-dnl FPTOOLS_SET_PLATFORM_VARS([host],[Host])
-dnl FPTOOLS_SET_HASKELL_PLATFORM_VARS([Host])
+GHC_CONVERT_PLATFORM_PARTS([build], [Build])
+GHC_CONVERT_PLATFORM_PARTS([host], [Host])
+GHC_CONVERT_PLATFORM_PARTS([target], [Target])
+FPTOOLS_SET_PLATFORM_VARS
+FPTOOLS_SET_HASKELL_PLATFORM_VARS([Host])
 
 AC_CHECK_HEADERS([ctype.h dirent.h dlfcn.h errno.h fcntl.h grp.h limits.h locale.h nlist.h pthread.h pwd.h signal.h sys/param.h sys/mman.h sys/resource.h sys/select.h sys/time.h sys/timeb.h sys/timerfd.h sys/timers.h sys/times.h sys/utsname.h sys/wait.h termios.h utime.h windows.h winsock.h sched.h])
 


=====================================
rts/include/rts/PosixSource.h
=====================================
@@ -37,6 +37,8 @@
 #define _XOPEN_SOURCE   700
 #endif
 
+#define _GNU_SOURCE 1
+
 #if defined(mingw32_HOST_OS)
 #  if defined(__USE_MINGW_ANSI_STDIO)
 #    if __USE_MINGW_ANSI_STDIO != 1


=====================================
rts/linker/Elf.c
=====================================
@@ -28,10 +28,10 @@
 #include "linker/util.h"
 #include "linker/elf_util.h"
 
-#include <link.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#include <link.h>
 #if defined(HAVE_DLFCN_H)
 #include <dlfcn.h>
 #endif


=====================================
rts/linker/elf_got.c
=====================================
@@ -1,6 +1,7 @@
 #include "Rts.h"
 #include "elf_got.h"
 #include "linker/MMap.h"
+#include "sys/mman.h"
 
 #include <string.h>
 


=====================================
rts/posix/ticker/Pthread.c
=====================================
@@ -55,6 +55,9 @@
 
 #include <string.h>
 
+#if defined(linux_HOST_OS)
+#define _GNU_SOURCE 1
+#endif
 #include <pthread.h>
 #if defined(HAVE_PTHREAD_NP_H)
 #include <pthread_np.h>



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/31095b1ec650755799ad7bc8d70f97101946c5a1

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/31095b1ec650755799ad7bc8d70f97101946c5a1
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221104/04d84d05/attachment-0001.html>