First support for .gnu.hash/DT_GNU_HASH.

[bold.git] / Bold / linker.py

diff --git a/Bold/linker.py b/Bold/linker.py
index 625a28d995de623e54e1c14435b004443e7d59fc..935b462f5d50c8c5bfefebe7c8b6e06adf7937a4 100644 (file)
--- a/Bold/linker.py
+++ b/Bold/linker.py
@@ -108,9 +108,12 @@ class BoldLinker(object):
     symbols = sorted(list(self.undefined_symbols))
 
     # Those three will soon be known...
-    symbols.remove('_bold__functions_count')
-    symbols.remove('_bold__functions_hash')
-    symbols.remove('_bold__functions_pointers')
+    if '_bold__functions_count' in symbols:
+      symbols.remove('_bold__functions_count')
+    if '_bold__functions_hash' in symbols:
+      symbols.remove('_bold__functions_hash')
+    if '_bold__functions_pointers' in symbols:
+      symbols.remove('_bold__functions_pointers')
 
     # Create the fake ELF object.
     fo = Elf64() # Don't care about most parts of ELF header (?)
@@ -126,17 +129,9 @@ class BoldLinker(object):
     fo.shdrs.append(data_shdr)
     fo.sections['.data'] = data_shdr
 
-    # .bss will contain pointers to resolved external functions, as well as
-    # the COMMON symbols (from C tentative declaration).
-    bss_size = len(symbols) * 8
-    for s_name, s_size, s_alignment in self.common_symbols:
-      padding = (s_alignment - (bss_size % s_alignment))
-      bss_size += padding + s_size
-
     bss_shdr = Elf64_Shdr()
     bss_shdr.sh_type = SHT_NOBITS
     bss_shdr.sh_flags = (SHF_WRITE | SHF_ALLOC)
-    bss_shdr.sh_size = bss_size
     bss_shdr.content = BinArray("")
     fo.shdrs.append(bss_shdr)
     fo.sections['.bss'] = bss_shdr
@@ -166,11 +161,12 @@ class BoldLinker(object):
     # The COMMON symbols. Assign an offset in .bss, declare as global.
     bss_common_offset = len(symbols) * 8
     for s_name, s_size, s_alignment in self.common_symbols:
-      padding = (s_alignment - (bss_common_offset % s_alignment))
+      padding = (s_alignment - (bss_common_offset % s_alignment)) % s_alignment
       bss_common_offset += padding
       fo.global_symbols[s_name] = (bss_shdr, bss_common_offset)
       bss_common_offset += s_size
 
+    bss_shdr.sh_size = bss_common_offset
 
     for n, i in enumerate(symbols):
       # The hash is always in .data