ld64-274.2.tar.gz

[apple/ld64.git] / src / ld / passes / huge.cpp

diff --git a/src/ld/passes/huge.cpp b/src/ld/passes/huge.cpp
index 932122aa27e7c7dbac05667270aa7205c115e64c..3797a23d6c95f9cb9e5e66b197ce705a09a8b17b 100644 (file)
--- a/src/ld/passes/huge.cpp
+++ b/src/ld/passes/huge.cpp
@@ -30,6 +30,7 @@
 #include <mach/machine.h>
 
 #include <vector>
 #include <mach/machine.h>
 
 #include <vector>

+#include <map>

 
 #include "ld.hpp"
 #include "huge.h"
 
 #include "ld.hpp"
 #include "huge.h"


@@ -46,10 +47,53 @@ public:
        }
 };
 
        }
 };
 

+class DataPadAtom : public ld::Atom {
+public:
+                                                                                       DataPadAtom(ld::Internal& state)
+                                                                                       : ld::Atom(_s_section, ld::Atom::definitionRegular, ld::Atom::combineNever,
+                                                                                                               ld::Atom::scopeTranslationUnit, ld::Atom::typeUnclassified,
+                                                                                                               symbolTableNotIn, false, false, false, ld::Atom::Alignment(3))
+                                                                                       { state.addAtom(*this); }
+
+
+       virtual const ld::File*                                 file() const                                    { return NULL; }
+       virtual const char*                                             name() const                                    { return "padding"; }
+       virtual uint64_t                                                size() const                                    { return 8; }
+       virtual uint64_t                                                objectAddress() const                   { return 0; }
+       virtual void                                                    copyRawContent(uint8_t buffer[]) const { }
+
+protected:
+       virtual                                                                 ~DataPadAtom() {}
+
+       static ld::Section                                              _s_section;
+};
+
+ld::Section DataPadAtom::_s_section("__DATA", "__data", ld::Section::typeUnclassified);
+
+

 void doPass(const Options& opts, ld::Internal& state)
 {
        const bool log = false;
 void doPass(const Options& opts, ld::Internal& state)
 {
        const bool log = false;

-       
+
+       // <rdar://problem/26015603> add __data section if __DATA segment was gutted by dirty data removal
+       if ( (opts.outputKind() == Options::kDynamicLibrary) && opts.useDataConstSegment() && opts.hasDataSymbolMoves() ) {
+               uint64_t dataAtomsSize = 0;
+               bool foundSegmentDATA_DIRTY = false;
+               for (ld::Internal::FinalSection* sect : state.sections) {
+                       if ( strcmp(sect->segmentName(), "__DATA") == 0 ) {
+                               for (const ld::Atom* atom : sect->atoms) {
+                                       dataAtomsSize += atom->size();
+                               }
+                       }
+                       else if ( strcmp(sect->segmentName(), "__DATA_DIRTY") == 0 ) {
+                               foundSegmentDATA_DIRTY = true;
+                       }
+               }
+               if ( foundSegmentDATA_DIRTY && (dataAtomsSize == 0) ) {
+                       new DataPadAtom(state);
+               }
+       }
+

        // only make make __huge section in final linked images
        if ( opts.outputKind() == Options::kObjectFile )
                return;
        // only make make __huge section in final linked images
        if ( opts.outputKind() == Options::kObjectFile )
                return;


@@ -83,7 +127,7 @@ void doPass(const Options& opts, ld::Internal& state)
                return;
 
        // move all zero fill atoms that >1MB in size to a new __huge section
                return;
 
        // move all zero fill atoms that >1MB in size to a new __huge section

-       ld::Internal::FinalSection* hugeSection = state.getFinalSection(ld::Section("__DATA", "__huge", ld::Section::typeZeroFill));
+       ld::Internal::FinalSection* hugeSection = state.getFinalSection(*new ld::Section("__DATA", "__huge", ld::Section::typeZeroFill));

        for (std::vector<ld::Internal::FinalSection*>::iterator sit=state.sections.begin(); sit != state.sections.end(); ++sit) {
                ld::Internal::FinalSection* sect = *sit;
                if ( sect == hugeSection )
        for (std::vector<ld::Internal::FinalSection*>::iterator sit=state.sections.begin(); sit != state.sections.end(); ++sit) {
                ld::Internal::FinalSection* sect = *sit;
                if ( sect == hugeSection )


@@ -94,6 +138,7 @@ void doPass(const Options& opts, ld::Internal& state)
                                const ld::Atom* atom = *ait;
                                if ( atom->size() > 1024*1024 ) {
                                        hugeSection->atoms.push_back(atom);
                                const ld::Atom* atom = *ait;
                                if ( atom->size() > 1024*1024 ) {
                                        hugeSection->atoms.push_back(atom);

+                                       state.atomToSection[atom] = hugeSection;

                                        if (log) fprintf(stderr, "moved to __huge: %s, size=%llu\n", atom->name(), atom->size());
                                        *ait = NULL;  // change atom to NULL for later bulk removal
                                        movedSome = true;
                                        if (log) fprintf(stderr, "moved to __huge: %s, size=%llu\n", atom->name(), atom->size());
                                        *ait = NULL;  // change atom to NULL for later bulk removal
                                        movedSome = true;