[Git][ghc/ghc][wip/supersven/ghc-9.10-riscv-ncg] 2 commits: Add missing parameter

[Sven Tennie (@supersven)]

Sven Tennie pushed to branch wip/supersven/ghc-9.10-riscv-ncg at Glasgow Haskell Compiler / GHC


Commits:
05a022fa by Sven Tennie at 2024-06-26T16:44:48+00:00
Add missing parameter

- - - - -
bbf81c3f by Sven Tennie at 2024-06-27T05:29:25+00:00
Fix MachO function prototype

- - - - -


2 changed files:

- rts/linker/Elf.c
- rts/linker/macho/plt.h


Changes:

=====================================
rts/linker/Elf.c
=====================================
@@ -1357,7 +1357,7 @@ do_Elf_Rel_relocations ( ObjectCode* oc, char* ehdrC,
                /* try to locate an existing stub for this target */
                if(findStub(&oc->sections[target_shndx], (void**)&S, 0)) {
                    /* didn't find any. Need to create one */
-                   if(makeStub(&oc->sections[target_shndx], (void**)&S, 0)) {
+                   if(makeStub(&oc->sections[target_shndx], (void**)&S, NULL, 0)) {
                        errorBelch("Unable to create veneer for ARM_CALL\n");
                        return 0;
                    }
@@ -1449,7 +1449,7 @@ do_Elf_Rel_relocations ( ObjectCode* oc, char* ehdrC,
                /* try to locate an existing stub for this target */
                if(findStub(&oc->sections[target_shndx], (void**)&S, 1)) {
                    /* didn't find any. Need to create one */
-                   if(makeStub(&oc->sections[target_shndx], (void**)&S, 1)) {
+                   if(makeStub(&oc->sections[target_shndx], (void**)&S, NULL, 1)) {
                        errorBelch("Unable to create veneer for ARM_THM_CALL\n");
                        return 0;
                    }


=====================================
rts/linker/macho/plt.h
=====================================
@@ -25,7 +25,7 @@ unsigned numberOfStubsForSection( ObjectCode *oc, unsigned sectionIndex);
 #define STUB_SIZE          ADD_SUFFIX(stubSize)
 
 bool findStub(Section * section, void* * addr, uint8_t flags);
-bool makeStub(Section * section, void* * addr, void* got_addr, uint8_t flags);
+bool makeStub(Section * section, void* * addr, uint8_t flags);
 
 void freeStubs(Section * section);
 



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b2e3c98b3d7313923fc9a004572221abe57fd648...bbf81c3ff30eb7ef53212bc6e3ae7ac567e93b3e

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b2e3c98b3d7313923fc9a004572221abe57fd648...bbf81c3ff30eb7ef53212bc6e3ae7ac567e93b3e
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/20240627/c5e041b3/attachment-0001.html>