RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 19:12:56 +02:00
Code Issues Projects Releases Wiki Activity

Implement PR679:

Browse Source 
* Changed the -rpath option from cl::opt to cl::list
* Changed the interface to GenerateNative to take a std::vector<std::string>
  instead of just a std::string
* Changed GenerateNative to generate multiple -Wl,-rpath, options to be
  passed to gcc.

llvm-svn: 24930
This commit is contained in:
Reid Spencer 2005-12-22 01:50:56 +00:00
parent ac0286cbe6
commit bca47d81ca
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/gccld/GenerateCode.cpp
View File

@ -352,7 +352,7 @@ int llvm::GenerateNative(const std::string &OutputFilename,
const sys::Path &gcc, char ** const envp,
bool Shared,
bool ExportAllAsDynamic,
const std::string &RPath,
const std::vector<std::string> &RPaths,
const std::string &SOName,
bool Verbose) {
// Remove these environment variables from the environment of the
@ -394,10 +394,13 @@ int llvm::GenerateNative(const std::string &OutputFilename,
if (Shared) args.push_back("-shared");
if (ExportAllAsDynamic) args.push_back("-export-dynamic");
if (!RPath.empty()) {
std::string rp = "-Wl,-rpath," + RPath;
StringsToDelete.push_back(strdup(rp.c_str()));
args.push_back(StringsToDelete.back());
if (!RPaths.empty()) {
for (std::vector<std::string>::const_iterator I = RPaths.begin(),
E = RPaths.end(); I != E; I++) {
std::string rp = "-Wl,-rpath," + *I;
StringsToDelete.push_back(strdup(rp.c_str()));
args.push_back(StringsToDelete.back());
}
}
if (!SOName.empty()) {
std::string so = "-Wl,-soname," + SOName;

7
tools/gccld/gccld.cpp
View File

@ -88,7 +88,7 @@ namespace {
SaveTemps("save-temps",
cl::desc("Do not delete temporary files"));
cl::opt<std::string>
cl::list<std::string>
RPath("rpath",
cl::desc("Set runtime shared library search path (requires -native or"
" -native-cbe)"),
@ -107,6 +107,11 @@ namespace {
CO5("eh-frame-hdr", cl::Hidden, cl::desc("Compatibility option: ignored"));
cl::opt<std::string>
CO6("h", cl::Hidden, cl::desc("Compatibility option: ignored"));
cl::opt<bool>
CO7("start-group", cl::Hidden, cl::desc("Compatibility option: ignored"));
cl::opt<bool>
CO8("end-group", cl::Hidden, cl::desc("Compatibility option: ignored"));
cl::alias A0("s", cl::desc("Alias for --strip-all"),
cl::aliasopt(Strip));
cl::alias A1("S", cl::desc("Alias for --strip-debug"),

2
tools/gccld/gccld.h
View File

@ -46,7 +46,7 @@ GenerateNative (const std::string &OutputFilename,
char ** const envp,
bool Shared,
bool ExportAllAsDynamic,
const std::string &RPath,
const std::vector<std::string> &RPath,
const std::string &SOName,
bool Verbose=false);