Merge pull request #3934 from eisenhauer/UpstreamFFSDill

UpstreamFFSDill
ornladios · Nov 27, 2023 · 29cb2f6 · 29cb2f6
2 parents 26cc34f + 11558ff
commit 29cb2f6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/thirdparty/dill/dill/arm8.c b/thirdparty/dill/dill/arm8.c
@@ -1517,6 +1517,8 @@ arm8_PLT_emit(dill_stream s, int package)
     }
 }
 
+extern void arm8_rt_call_link(arm8_rt_call_link(char *code, call_t *t);
+
 static void
 arm8_call_link(dill_stream s)
 {

diff --git a/thirdparty/ffs/ffs/CMakeLists.txt b/thirdparty/ffs/ffs/CMakeLists.txt
@@ -224,6 +224,8 @@ CHECK_INCLUDE_FILE(sys/time.h HAVE_SYS_TIME_H)
 CHECK_INCLUDE_FILE(sys/times.h HAVE_SYS_TIMES_H)
 CHECK_INCLUDE_FILE(sys/uio.h HAVE_SYS_UIO_H)
 CHECK_INCLUDE_FILE(sys/un.h HAVE_SYS_UN_H)
+CHECK_INCLUDE_FILE(netinet/in.h HAVE_NETINET_IN_H)
+CHECK_INCLUDE_FILE(arpa/inet.h HAVE_ARPA_INET_H)
 CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H)
 CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H)
 CHECK_INCLUDE_FILE(winsock.h HAVE_WINSOCK_H)

diff --git a/thirdparty/ffs/ffs/fm/fm_formats.c b/thirdparty/ffs/ffs/fm/fm_formats.c
@@ -15,6 +15,9 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
 #ifdef HAVE_WINDOWS_H
 #include <winsock.h>
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -1517,6 +1517,8 @@ arm8_PLT_emit(dill_stream s, int package) @@
         }
     }
+    extern void arm8_rt_call_link(arm8_rt_call_link(char *code, call_t *t);
     static void
     arm8_call_link(dill_stream s)
     {
@@ Expand Down @@