[Git][ghc/ghc][wip/unloading-fixes] Try fixing it

[Ben Gamari]

Ben Gamari pushed to branch wip/unloading-fixes at Glasgow Haskell Compiler / GHC


Commits:
53522ffc by Ben Gamari at 2020-11-28T10:22:57-05:00
Try fixing it

- - - - -


2 changed files:

- rts/LinkerInternals.h
- rts/linker/Elf.c


Changes:

=====================================
rts/LinkerInternals.h
=====================================
@@ -35,6 +35,7 @@ void printLoadedObjects(void);
 
 typedef void SymbolAddr;
 typedef char SymbolName;
+typedef struct _ObjectCode ObjectCode;
 
 #if defined(OBJFORMAT_ELF)
 #  include "linker/ElfTypes.h"
@@ -199,7 +200,7 @@ typedef enum {
 /* Top-level structure for an object module.  One of these is allocated
  * for each object file in use.
  */
-typedef struct _ObjectCode {
+struct _ObjectCode {
     OStatus    status;
     pathchar  *fileName;
     int        fileSize;     /* also mapped image size when using mmap() */
@@ -319,7 +320,7 @@ typedef struct _ObjectCode {
 
     /* virtual memory ranges of loaded code */
     NativeCodeRange *nc_ranges;
-} ObjectCode;
+};
 
 #define OC_INFORMATIVE_FILENAME(OC)             \
     ( (OC)->archiveMemberName ?                 \


=====================================
rts/linker/Elf.c
=====================================
@@ -22,6 +22,7 @@
 #include "linker/M32Alloc.h"
 #include "linker/SymbolExtras.h"
 #include "ForeignExports.h"
+#include "Profiling.h"
 #include "sm/OSMem.h"
 #include "GetEnv.h"
 #include "linker/util.h"



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/53522ffc245d8909bd86f0092e6791ce36bf7467

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/53522ffc245d8909bd86f0092e6791ce36bf7467
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/20201128/36feba66/attachment-0001.html>