From 22bd70fa3199c3e8fa64e9ef64d72c1e5c297dfb Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Tue, 14 Mar 2017 19:57:13 +0000 Subject: [PATCH] Archives require a symbol table on Solaris, even if empty. On Solaris ld (and some other tools that use the underlying utility libraries, such as elfdump) chokes on an archive library that has no symbol table. The Solaris tools always create one, even if it's empty. That bug has been fixed in the latest development line, and can probably be backported to a supported release, but it would be nice if LLVM's archiver could emit the empty symbol table, too. Patch by Danek Duvall! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@297773 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Object/ArchiveWriter.cpp | 5 +++++ test/Object/Inputs/solaris-nosymbols.yaml | 7 +++++++ test/Object/archive-format.test | 12 ++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 test/Object/Inputs/solaris-nosymbols.yaml diff --git a/lib/Object/ArchiveWriter.cpp b/lib/Object/ArchiveWriter.cpp index 83fbf2f5854..d5ff2dbf7be 100644 --- a/lib/Object/ArchiveWriter.cpp +++ b/lib/Object/ArchiveWriter.cpp @@ -341,6 +341,11 @@ writeSymbolTable(raw_fd_ostream &Out, object::Archive::Kind Kind, if (isBSDLike(Kind)) print32(Out, Kind, StringTable.size()); // byte count of the string table Out << StringTable; + // If there are no symbols, emit an empty symbol table, to satisfy Solaris + // tools, older versions of which expect a symbol table in a non-empty + // archive, regardless of whether there are any symbols in it. + if (StringTable.size() == 0) + print32(Out, Kind, 0); // ld64 requires the next member header to start at an offset that is // 4 bytes aligned. diff --git a/test/Object/Inputs/solaris-nosymbols.yaml b/test/Object/Inputs/solaris-nosymbols.yaml new file mode 100644 index 00000000000..85dabedcf9a --- /dev/null +++ b/test/Object/Inputs/solaris-nosymbols.yaml @@ -0,0 +1,7 @@ +--- !ELF +FileHeader: + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + Machine: EM_X86_64 +... diff --git a/test/Object/archive-format.test b/test/Object/archive-format.test index f895a36bce3..219fc7f894a 100644 --- a/test/Object/archive-format.test +++ b/test/Object/archive-format.test @@ -78,3 +78,15 @@ THIN-PATH-NEXT: /65 0 0 0 644 4 ` RUN: not llvm-ar --format=bsd rcT bad.a 0123456789abcde 0123456789abcdef 2>&1 | FileCheck --check-prefix=BSD-THIN %s BSD-THIN: Only the gnu format has a thin mode. + +If an archive has an object with no symbols, the linker and some other +tools on some versions of Solaris will abort operations if there is no +symbol table. Create such an object, put it into an archive, and check to +see that there is an empty symbol table. +RUN: mkdir -p %t +RUN: yaml2obj %S/Inputs/solaris-nosymbols.yaml > %t/foo.o +RUN: llvm-ar rs %t/foo.a %t/foo.o +RUN: cat -v %t/foo.a | FileCheck -strict-whitespace --check-prefix=SOLARIS %s +SOLARIS: ! +SOLARIS-NEXT: / 0 0 0 0 8 ` +SOLARIS-NEXT: ^@^@^@^@^@^@^@^@foo.o/ -- 2.50.1