1 From 695734ad55d58ac27b2e0e53ab039834a07b7432 Mon Sep 17 00:00:00 2001 2 From: Andrew Hsieh <andrewhsieh (a] google.com> 3 Date: Tue, 19 Mar 2013 10:39:35 -0700 4 Subject: [PATCH 4/5] Fix --build-id to not accept next arg 5 6 Only the following two forms are allowed 7 --build-id # default to sha1 8 --build-id=style # choose style 9 10 Neither swallow next arg, which happen to be "-m" when ld.mcld is invoked 11 from clang, and cause GNU linker emulation fail 12 13 Change-Id: Ib7ea2da8fdca2cb028d3c6be0204fdfe5fa4ccc6 14 --- 15 tools/llvm-mcld/llvm-mcld.cpp | 6 +++++- 16 1 file changed, 5 insertions(+), 1 deletion(-) 17 18 diff --git a/tools/llvm-mcld/llvm-mcld.cpp b/tools/llvm-mcld/llvm-mcld.cpp 19 index 81a7f55..207f4bb 100644 20 --- a/tools/llvm-mcld/llvm-mcld.cpp 21 +++ b/tools/llvm-mcld/llvm-mcld.cpp 22 @@ -590,8 +590,12 @@ ArgExcludeLIBS("exclude-libs", 23 cl::desc("Exclude libraries from automatic export"), 24 cl::value_desc("lib1,lib2,...")); 25 26 +static cl::opt<bool> 27 +ArgBuildIDDefault("build-id", 28 + cl::desc("Request creation of \".note.gnu.build-id\" ELF note section in sha1.")); 29 + 30 static cl::opt<std::string> 31 -ArgBuildID("build-id", 32 +ArgBuildID("build-id=", 33 cl::desc("Request creation of \".note.gnu.build-id\" ELF note section."), 34 cl::value_desc("style")); 35 36 -- 37 1.8.1.3 38 39
