ld64-302.3.tar.gz

[apple/ld64.git] / src / ld / InputFiles.h

diff --git a/src/ld/InputFiles.h b/src/ld/InputFiles.h
index afc2077349923d5fa402caf174099e0f8c239a75..21f878a513b3046e5e3258a6d804ff5187d56593 100644 (file)
--- a/src/ld/InputFiles.h
+++ b/src/ld/InputFiles.h
@@ -60,10 +60,10 @@ public:
                                                                InputFiles(Options& opts, const char** archName);
 
        // implementation from ld::dylib::File::DylibHandler
                                                                InputFiles(Options& opts, const char** archName);
 
        // implementation from ld::dylib::File::DylibHandler

-       virtual ld::dylib::File*        findDylib(const char* installPath, const char* fromPath);
+       virtual ld::dylib::File*        findDylib(const char* installPath, const ld::dylib::File* fromDylib, bool speculative);

        
        // iterates all atoms in initial files
        
        // iterates all atoms in initial files

-       void                                            forEachInitialAtom(ld::File::AtomHandler&);
+       void                                            forEachInitialAtom(ld::File::AtomHandler&, ld::Internal& state);

        // searches libraries for name
        bool                                            searchLibraries(const char* name, bool searchDylibs, bool searchArchives,  
                                                                                                                                  bool dataSymbolOnly, ld::File::AtomHandler&) const;
        // searches libraries for name
        bool                                            searchLibraries(const char* name, bool searchDylibs, bool searchArchives,  
                                                                                                                                  bool dataSymbolOnly, ld::File::AtomHandler&) const;


@@ -72,8 +72,13 @@ public:
        // copy dylibs to link with in command line order
        void                                            dylibs(ld::Internal& state);
        
        // copy dylibs to link with in command line order
        void                                            dylibs(ld::Internal& state);
        

+       void                                            archives(ld::Internal& state);
+       

        bool                                            inferredArch() const { return _inferredArch; }
        
        bool                                            inferredArch() const { return _inferredArch; }
        

+       void                                            addLinkerOptionLibraries(ld::Internal& state, ld::File::AtomHandler& handler);
+       void                                            createIndirectDylibs();
+

        // for -print_statistics
        volatile int64_t                        _totalObjectSize;
        volatile int64_t                        _totalArchiveSize;
        // for -print_statistics
        volatile int64_t                        _totalObjectSize;
        volatile int64_t                        _totalArchiveSize;


@@ -88,14 +93,16 @@ private:
        ld::File*                                       makeFile(const Options::FileInfo& info, bool indirectDylib);
        ld::File*                                       addDylib(ld::dylib::File* f,        const Options::FileInfo& info);
        void                                            logTraceInfo (const char* format, ...) const;
        ld::File*                                       makeFile(const Options::FileInfo& info, bool indirectDylib);
        ld::File*                                       addDylib(ld::dylib::File* f,        const Options::FileInfo& info);
        void                                            logTraceInfo (const char* format, ...) const;

-       void                                            logDylib(ld::File*, bool indirect);
+       void                                            logDylib(ld::File*, bool indirect, bool speculative);

        void                                            logArchive(ld::File*) const;
        void                                            logArchive(ld::File*) const;

-       void                                            createIndirectDylibs();
+       void                                            markExplicitlyLinkedDylibs();

        void                                            checkDylibClientRestrictions(ld::dylib::File*);
        void                                            createOpaqueFileSections();
        void                                            checkDylibClientRestrictions(ld::dylib::File*);
        void                                            createOpaqueFileSections();

-       
+       bool                                            libraryAlreadyLoaded(const char* path);
+       bool                                            frameworkAlreadyLoaded(const char* path, const char* frameworkName);
+

        // for pipelined linking
        // for pipelined linking

-    void                      waitForInputFiles();
+    void                                               waitForInputFiles();

        static void                                     waitForInputFiles(InputFiles *inputFiles);
 
        // for threaded input file processing
        static void                                     waitForInputFiles(InputFiles *inputFiles);
 
        // for threaded input file processing


@@ -103,21 +110,16 @@ private:
        static void                                     parseWorkerThread(InputFiles *inputFiles);
        void                                            startThread(void (*threadFunc)(InputFiles *)) const;
 
        static void                                     parseWorkerThread(InputFiles *inputFiles);
        void                                            startThread(void (*threadFunc)(InputFiles *)) const;
 

-       class CStringEquals {
-       public:
-               bool operator()(const char* left, const char* right) const { return (strcmp(left, right) == 0); }
-       };
-       typedef __gnu_cxx::hash_map<const char*, ld::dylib::File*, __gnu_cxx::hash<const char*>, CStringEquals> InstallNameToDylib;
+       typedef std::unordered_map<const char*, ld::dylib::File*, CStringHash, CStringEquals>   InstallNameToDylib;

 
        const Options&                          _options;
        std::vector<ld::File*>          _inputFiles;
        mutable std::set<class ld::File*>       _archiveFilesLogged;
 
        const Options&                          _options;
        std::vector<ld::File*>          _inputFiles;
        mutable std::set<class ld::File*>       _archiveFilesLogged;

+       mutable std::vector<std::string>        _archiveFilePaths;

        InstallNameToDylib                      _installPathToDylibs;
        std::set<ld::dylib::File*>      _allDylibs;
        ld::dylib::File*                        _bundleLoader;
        InstallNameToDylib                      _installPathToDylibs;
        std::set<ld::dylib::File*>      _allDylibs;
        ld::dylib::File*                        _bundleLoader;

-       bool                                            _allDirectDylibsLoaded;

        bool                                            _inferredArch;
        bool                                            _inferredArch;

-    int                       _fileMonitor;

     struct strcompclass {
         bool operator() (const char *a, const char *b) const { return ::strcmp(a, b) < 0; }
     };
     struct strcompclass {
         bool operator() (const char *a, const char *b) const { return ::strcmp(a, b) < 0; }
     };


@@ -137,6 +139,7 @@ private:
        int                                                     _remainingInputFiles;   // number of input files still to parse
        
        ld::File::Ordinal                       _indirectDylibOrdinal;
        int                                                     _remainingInputFiles;   // number of input files still to parse
        
        ld::File::Ordinal                       _indirectDylibOrdinal;

+       ld::File::Ordinal                       _linkerOptionOrdinal;

     
     class LibraryInfo {
         ld::File* _lib;
     
     class LibraryInfo {
         ld::File* _lib;


@@ -145,9 +148,9 @@ private:
         LibraryInfo(ld::dylib::File* dylib) : _lib(dylib), _isDylib(true) {};
         LibraryInfo(ld::archive::File* dylib) : _lib(dylib), _isDylib(false) {};
 
         LibraryInfo(ld::dylib::File* dylib) : _lib(dylib), _isDylib(true) {};
         LibraryInfo(ld::archive::File* dylib) : _lib(dylib), _isDylib(false) {};
 

-        bool isDylib() { return _isDylib; }
-        ld::dylib::File *dylib() { return (ld::dylib::File*)_lib; }
-        ld::archive::File *archive() { return (ld::archive::File*)_lib; }
+        bool isDylib() const { return _isDylib; }
+        ld::dylib::File *dylib() const { return (ld::dylib::File*)_lib; }
+        ld::archive::File *archive() const { return (ld::archive::File*)_lib; }

     };
     std::vector<LibraryInfo>  _searchLibraries;
 };
     };
     std::vector<LibraryInfo>  _searchLibraries;
 };