diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2012-12-17 21:32:42 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2012-12-17 21:32:42 +0000 |
| commit | 6c31d313575bba1b87b583260f39f0b0dae143f4 (patch) | |
| tree | f51bbd65f53587671d77034d5d65ad0ee8506afe /lib/MC | |
| parent | c83b8fec01565df67da45f437ca1311f7286e53b (diff) | |
| download | external_llvm-6c31d313575bba1b87b583260f39f0b0dae143f4.zip external_llvm-6c31d313575bba1b87b583260f39f0b0dae143f4.tar.gz external_llvm-6c31d313575bba1b87b583260f39f0b0dae143f4.tar.bz2 | |
Prepare LLVM to fix PR14625, exposing a hook in MCContext to manage the
compilation directory.
This defaults to the current working directory, just as it always has,
but now an assembler can choose to override it with a custom directory.
I've taught llvm-mc about this option and added a test case.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@170371 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC')
| -rw-r--r-- | lib/MC/MCContext.cpp | 3 | ||||
| -rw-r--r-- | lib/MC/MCDwarf.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/MC/MCContext.cpp b/lib/MC/MCContext.cpp index 19ff49c..29727ac 100644 --- a/lib/MC/MCContext.cpp +++ b/lib/MC/MCContext.cpp @@ -35,7 +35,8 @@ MCContext::MCContext(const MCAsmInfo &mai, const MCRegisterInfo &mri, bool DoAutoReset ) : SrcMgr(mgr), MAI(mai), MRI(mri), MOFI(mofi), Allocator(), Symbols(Allocator), UsedNames(Allocator), - NextUniqueID(0), + NextUniqueID(0), + CompilationDir(llvm::sys::Path::GetCurrentDirectory().str()), CurrentDwarfLoc(0,0,0,DWARF2_FLAG_IS_STMT,0,0), DwarfLocSeen(false), GenDwarfForAssembly(false), GenDwarfFileNumber(0), AllowTemporaryLabels(true), AutoReset(DoAutoReset) { diff --git a/lib/MC/MCDwarf.cpp b/lib/MC/MCDwarf.cpp index 597ee1d..d53d2fc 100644 --- a/lib/MC/MCDwarf.cpp +++ b/lib/MC/MCDwarf.cpp @@ -627,8 +627,7 @@ static void EmitGenDwarfInfo(MCStreamer *MCOS, MCOS->EmitIntValue(0, 1); // NULL byte to terminate the string. // AT_comp_dir, the working directory the assembly was done in. - llvm::sys::Path CWD = llvm::sys::Path::GetCurrentDirectory(); - MCOS->EmitBytes(StringRef(CWD.c_str()), 0); + MCOS->EmitBytes(context.getCompilationDir(), 0); MCOS->EmitIntValue(0, 1); // NULL byte to terminate the string. // AT_APPLE_flags, the command line arguments of the assembler tool. |