Page MenuHomePhabricator

Please use GitHub pull requests for new patches. Phabricator shutdown timeline

Fix JITLink for ELF X86 so that it accepts a .bss section by adding a call to createZeroFillBlock

Authored by drmeister on Oct 5 2020, 7:38 PM.



Add an invocation to createZeroFillBlock to allow the .bss section to be loaded.
Also, enhance two error messages so that they print the name of the section that they could not find.

Diff Detail

Event Timeline

drmeister created this revision.Oct 5 2020, 7:38 PM
Herald added a project: Restricted Project. · View Herald TranscriptOct 5 2020, 7:38 PM
drmeister requested review of this revision.Oct 5 2020, 7:38 PM

Fixed the formatting suggestions from my first submission.

lhames added a comment.Oct 5 2020, 9:16 PM

Looks great -- thanks @drmeister.

All of Lint's comments about formatting are valid. If you want an easy way to avoid formatting comments in the future you can use the git-clang-format utility. Just make sure clang is in your path, then run:

/path/to/clang/tools/clang-format/git-clang-format <commit>


/path/to/clang/tools/clang-format/git-clang-format HEAD

That will reformat your patch to match clang's formatting guides. (In this patch you'll also need to fix the case on one of your variables: I don't believe clang-format fixes case for you).

This also needs an llvm-jitlink regression test. I think the following change to llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_relocations.s should work:

diff --git a/llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_relocations.s b/llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_relocations.s
index ca9c926b32d..0eef1111026 100644
--- a/llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_relocations.s
+++ b/llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_relocations.s
@@ -46,6 +46,17 @@ named_data:
         .long   42
         .size   named_data, 4
+# Test BSS / zero-fill section handling.
+# llvm-jitlink: *{4}bss_variable = 0
+       .type   bss_variable,@object
+       .bss
+       .globl  bss_variable
+       .p2align        2
+       .long   0
+       .size   bss_variable, 4
         .ident  "clang version 10.0.0-4ubuntu1 "
         .section        ".note.GNU-stack","",@progbits

I have verified that it fails without your patch -- if it runs with it then this is a viable test.

lhames accepted this revision.Oct 5 2020, 9:17 PM

You beat me to it with the formatting. Assuming the test case works for you this is good to land.

This revision is now accepted and ready to land.Oct 5 2020, 9:17 PM