<div dir="ltr">LGTM as a post commit review :)<div><br></div><div>-eric</div></div><br><div class="gmail_quote"><div dir="ltr">On Tue, Jul 18, 2017 at 7:10 PM Petr Hosek via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: phosek<br>
Date: Tue Jul 18 19:09:37 2017<br>
New Revision: 308408<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=308408&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=308408&view=rev</a><br>
Log:<br>
[llvm-readobj] Install llvm-readelf alias<br>
<br>
Install an llvm-readelf symlink to llvm-readobj.<br>
When invoked as *readelf*, default to -elf-output-style=GNU.<br>
<br>
Patch by Roland McGrath<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D33869" rel="noreferrer" target="_blank">https://reviews.llvm.org/D33869</a><br>
<br>
Modified:<br>
llvm/trunk/test/CMakeLists.txt<br>
llvm/trunk/test/tools/llvm-readobj/gnu-sections.test<br>
llvm/trunk/tools/llvm-readobj/CMakeLists.txt<br>
llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp<br>
<br>
Modified: llvm/trunk/test/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CMakeLists.txt?rev=308408&r1=308407&r2=308408&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CMakeLists.txt?rev=308408&r1=308407&r2=308408&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CMakeLists.txt (original)<br>
+++ llvm/trunk/test/CMakeLists.txt Tue Jul 18 19:09:37 2017<br>
@@ -67,6 +67,7 @@ set(LLVM_TEST_DEPENDS<br>
llvm-profdata<br>
llvm-ranlib<br>
llvm-readobj<br>
+ llvm-readelf<br>
llvm-rtdyld<br>
llvm-size<br>
llvm-split<br>
<br>
Modified: llvm/trunk/test/tools/llvm-readobj/gnu-sections.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/gnu-sections.test?rev=308408&r1=308407&r2=308408&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/gnu-sections.test?rev=308408&r1=308407&r2=308408&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/llvm-readobj/gnu-sections.test (original)<br>
+++ llvm/trunk/test/tools/llvm-readobj/gnu-sections.test Tue Jul 18 19:09:37 2017<br>
@@ -8,6 +8,8 @@ RUN: | FileCheck %s -check-prefix ELF6<br>
RUN: llvm-readobj -W --sections \<br>
RUN: %p/Inputs/relocs.obj.elf-x86_64 --elf-output-style=GNU \<br>
RUN: | FileCheck %s -check-prefix ELF64<br>
+RUN: llvm-readelf -W -S %p/Inputs/relocs.obj.elf-x86_64 \<br>
+RUN: | FileCheck %s -check-prefix ELF64<br>
<br>
ELF32: Section Headers:<br>
ELF32-NEXT: [Nr] Name Type Address Off Size ES Flg Lk Inf Al<br>
<br>
Modified: llvm/trunk/tools/llvm-readobj/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/CMakeLists.txt?rev=308408&r1=308407&r2=308408&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/CMakeLists.txt?rev=308408&r1=308407&r2=308408&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-readobj/CMakeLists.txt (original)<br>
+++ llvm/trunk/tools/llvm-readobj/CMakeLists.txt Tue Jul 18 19:09:37 2017<br>
@@ -20,3 +20,5 @@ add_llvm_tool(llvm-readobj<br>
WasmDumper.cpp<br>
Win64EHDumper.cpp<br>
)<br>
+<br>
+add_llvm_tool_symlink(llvm-readelf llvm-readobj)<br>
<br>
Modified: llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp?rev=308408&r1=308407&r2=308408&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp?rev=308408&r1=308407&r2=308408&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp (original)<br>
+++ llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp Tue Jul 18 19:09:37 2017<br>
@@ -34,6 +34,7 @@<br>
#include "llvm/Support/Debug.h"<br>
#include "llvm/Support/FileSystem.h"<br>
#include "llvm/Support/ManagedStatic.h"<br>
+#include "llvm/Support/Path.h"<br>
#include "llvm/Support/PrettyStackTrace.h"<br>
#include "llvm/Support/ScopedPrinter.h"<br>
#include "llvm/Support/Signals.h"<br>
@@ -544,7 +545,8 @@ static void dumpInput(StringRef File) {<br>
}<br>
<br>
int main(int argc, const char *argv[]) {<br>
- sys::PrintStackTraceOnErrorSignal(argv[0]);<br>
+ StringRef ToolName = argv[0];<br>
+ sys::PrintStackTraceOnErrorSignal(ToolName);<br>
PrettyStackTraceProgram X(argc, argv);<br>
llvm_shutdown_obj Y;<br>
<br>
@@ -553,6 +555,9 @@ int main(int argc, const char *argv[]) {<br>
<br>
opts::WideOutput.setHiddenFlag(cl::Hidden);<br>
<br>
+ if (sys::path::stem(ToolName).find("readelf") != StringRef::npos)<br>
+ opts::Output = opts::GNU;<br>
+<br>
cl::ParseCommandLineOptions(argc, argv, "LLVM Object Reader\n");<br>
<br>
// Default to stdin if no filename is specified.<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>