diff options
| author | Andy Gibbs <andyg1001@hotmail.co.uk> | 2012-12-22 09:46:10 +0000 |
|---|---|---|
| committer | Andy Gibbs <andyg1001@hotmail.co.uk> | 2012-12-22 09:46:10 +0000 |
| commit | d02bf1d23283f74aa9c20013da72a71718269bd4 (patch) | |
| tree | 3f9f0d057d093c2f1a1164c97757619ba1dba6b7 | |
| parent | fc5ee3516c62a00be73e17f393dfc8308d1bf460 (diff) | |
| download | bcm5719-llvm-d02bf1d23283f74aa9c20013da72a71718269bd4.tar.gz bcm5719-llvm-d02bf1d23283f74aa9c20013da72a71718269bd4.zip | |
Fix build issue when building lld against libstdc++ 4.7
llvm-svn: 170983
| -rw-r--r-- | lld/include/lld/Driver/Driver.h | 2 | ||||
| -rw-r--r-- | lld/lib/Driver/Drivers.cpp | 2 | ||||
| -rw-r--r-- | lld/tools/lld/lld.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lld/include/lld/Driver/Driver.h b/lld/include/lld/Driver/Driver.h index d2ff7b45396..22bd031c0e5 100644 --- a/lld/include/lld/Driver/Driver.h +++ b/lld/include/lld/Driver/Driver.h @@ -48,7 +48,7 @@ public: virtual ~Driver(); virtual std::unique_ptr<llvm::opt::DerivedArgList> - transform(llvm::ArrayRef<const char *const> args) = 0; + transform(llvm::ArrayRef<const char *> args) = 0; /// \param flavor driver flavor to create. /// \param defaultTargetTriple target triple as determined by the program name diff --git a/lld/lib/Driver/Drivers.cpp b/lld/lib/Driver/Drivers.cpp index 5b3478c5f6b..5add202b921 100644 --- a/lld/lib/Driver/Drivers.cpp +++ b/lld/lib/Driver/Drivers.cpp @@ -89,7 +89,7 @@ public: LDDriver(StringRef defaultTargetTriple) : Driver(defaultTargetTriple) {} virtual std::unique_ptr<llvm::opt::DerivedArgList> - transform(llvm::ArrayRef<const char *const> args) { + transform(llvm::ArrayRef<const char *> args) { assert(!_inputArgs && "transform may only be called once!"); unsigned missingIndex, missingCount; diff --git a/lld/tools/lld/lld.cpp b/lld/tools/lld/lld.cpp index 78b2547b5df..fe1cee96aac 100644 --- a/lld/tools/lld/lld.cpp +++ b/lld/tools/lld/lld.cpp @@ -123,7 +123,7 @@ int main(int argc, char **argv) { // Transform to core arguments. driver = Driver::create(iHazAFlavor, getDefaultTarget(argc, argv)); coreArgs = driver->transform( - llvm::ArrayRef<const char *const>(argv + 1, argv + argc)); + llvm::ArrayRef<const char *>(argv + 1, argv + argc)); } if (!coreArgs) |

