[llvm-commits] CVS: llvm/tools/gccld/GenerateCode.cpp gccld.cpp

[Reid Spencer]

Changes in directory llvm/tools/gccld:

GenerateCode.cpp updated: 1.48 -> 1.49
gccld.cpp updated: 1.100 -> 1.101
---
Log message:

For PR495: http://llvm.cs.uiuc.edu/PR495 :
Get rid of the difference between file paths and directory paths. The Path
class now simply stores a path that can refer to either a file or a 
directory. This required various changes in the implementation and interface
of the class with the corresponding impact to its users. Doxygen comments were
also updated to reflect these changes. Interface changes are:

appendDirectory -> appendComponent
appendFile -> appendComponent
elideDirectory -> eraseComponent
elideFile -> eraseComponent
elideSuffix -> eraseSuffix
renameFile -> rename
setDirectory -> set
setFile -> set

Changes pass Dejagnu and llvm-test/SingleSource tests.


---
Diffs of the changes:  (+8 -12)

 GenerateCode.cpp |   12 ++++--------
 gccld.cpp        |    8 ++++----
 2 files changed, 8 insertions(+), 12 deletions(-)


Index: llvm/tools/gccld/GenerateCode.cpp
diff -u llvm/tools/gccld/GenerateCode.cpp:1.48 llvm/tools/gccld/GenerateCode.cpp:1.49
--- llvm/tools/gccld/GenerateCode.cpp:1.48	Thu Apr 21 18:59:28 2005
+++ llvm/tools/gccld/GenerateCode.cpp	Thu Jul  7 18:21:43 2005
@@ -152,15 +152,11 @@
 static bool isBytecodeLPath(const std::string &LibPath) {
   bool isBytecodeLPath = false;
 
-  // Make sure the -L path has a '/' character
-  // because llvm-g++ passes them without the ending
-  // '/' char and sys::Path doesn't think it is a
-  // directory (see: sys::Path::isDirectory) without it
-  std::string dir = LibPath;
-  if ( dir[dir.length()-1] != '/' )
-  dir.append("/");
+  sys::Path LPath(LibPath);
 
-  sys::Path LPath(dir);
+  // Make sure its a directory
+  if (!LPath.isDirectory())
+    return isBytecodeLPath;
 
   // Grab the contents of the -L path
   std::set<sys::Path> Files;


Index: llvm/tools/gccld/gccld.cpp
diff -u llvm/tools/gccld/gccld.cpp:1.100 llvm/tools/gccld/gccld.cpp:1.101
--- llvm/tools/gccld/gccld.cpp:1.100	Thu Apr 21 18:59:28 2005
+++ llvm/tools/gccld/gccld.cpp	Thu Jul  7 18:21:43 2005
@@ -313,9 +313,9 @@
 
       if (!SaveTemps) {
         // Remove the assembly language file.
-        AssemblyFile.destroyFile();
+        AssemblyFile.destroy();
         // Remove the bytecode language file.
-        sys::Path(RealBytecodeOutput).destroyFile();
+        sys::Path(RealBytecodeOutput).destroy();
       }
 
     } else if (NativeCBE) {
@@ -345,9 +345,9 @@
 
       if (!SaveTemps) {
         // Remove the assembly language file.
-        CFile.destroyFile();
+        CFile.destroy();
         // Remove the bytecode language file.
-        sys::Path(RealBytecodeOutput).destroyFile();
+        sys::Path(RealBytecodeOutput).destroy();
       }
 
     } else if (!LinkAsLibrary) {