ld64-253.3.tar.gz

[apple/ld64.git] / src / ld / passes / stubs / stub_arm.hpp

diff --git a/src/ld/passes/stubs/stub_arm.hpp b/src/ld/passes/stubs/stub_arm.hpp
index 5c8fc42f5d125f6f8cc2b7f552cdaf6b1ab8dd70..02ae454502d3eba954ea48b630a67d8cc4fb3872 100644 (file)
--- a/src/ld/passes/stubs/stub_arm.hpp
+++ b/src/ld/passes/stubs/stub_arm.hpp
@@ -234,8 +234,9 @@ class LazyPointerAtom : public ld::Atom {
 public:
                                                                                        LazyPointerAtom(ld::passes::stubs::Pass& pass, const ld::Atom& stubTo,
                                                                                                                        bool stubToGlobalWeakDef, bool stubToResolver, 
 public:
                                                                                        LazyPointerAtom(ld::passes::stubs::Pass& pass, const ld::Atom& stubTo,
                                                                                                                        bool stubToGlobalWeakDef, bool stubToResolver, 

-                                                                                                                       bool weakImport, bool close)
-                               : ld::Atom(close ? _s_sectionClose : _s_section, ld::Atom::definitionRegular, 
+                                                                                                                       bool weakImport, bool close, bool usingDataConst)
+                               : ld::Atom(selectSection(close, stubToGlobalWeakDef, stubToResolver, usingDataConst),
+                                                       ld::Atom::definitionRegular,

                                                        ld::Atom::combineNever, ld::Atom::scopeLinkageUnit, ld::Atom::typeLazyPointer, 
                                                        symbolTableNotIn, false, false, false, ld::Atom::Alignment(2)), 
                                _stubTo(stubTo),
                                                        ld::Atom::combineNever, ld::Atom::scopeLinkageUnit, ld::Atom::typeLazyPointer, 
                                                        symbolTableNotIn, false, false, false, ld::Atom::Alignment(2)), 
                                _stubTo(stubTo),


@@ -243,7 +244,7 @@ public:
                                _resolverHelper(pass, stubTo, this),
                                _fixup1(0, ld::Fixup::k1of1, ld::Fixup::kindStoreTargetAddressLittleEndian32, 
                                                                stubToResolver ? &_resolverHelper : (stubToGlobalWeakDef ?  &stubTo : &_helper)),
                                _resolverHelper(pass, stubTo, this),
                                _fixup1(0, ld::Fixup::k1of1, ld::Fixup::kindStoreTargetAddressLittleEndian32, 
                                                                stubToResolver ? &_resolverHelper : (stubToGlobalWeakDef ?  &stubTo : &_helper)),

-                               _fixup2(0, ld::Fixup::k1of1, ld::Fixup::kindLazyTarget, &stubTo) { 
+                               _fixup2(0, ld::Fixup::k1of1, ld::Fixup::kindLazyTarget, &stubTo) {

                                                _fixup2.weakImport = weakImport; pass.addAtom(*this); 
                                                if ( stubToResolver )
                                                        pass.addAtom(_resolverHelper);
                                                _fixup2.weakImport = weakImport; pass.addAtom(*this); 
                                                if ( stubToResolver )
                                                        pass.addAtom(_resolverHelper);


@@ -261,6 +262,17 @@ public:
        virtual ld::Fixup::iterator                             fixupsEnd()     const                           { return &((ld::Fixup*)&_fixup2)[1]; }
 
 private:
        virtual ld::Fixup::iterator                             fixupsEnd()     const                           { return &((ld::Fixup*)&_fixup2)[1]; }
 
 private:

+       static ld::Section& selectSection(bool close, bool stubToGlobalWeakDef, bool stubToResolver, bool usingDataConst) {
+               if ( close )
+                       return _s_sectionClose;
+               else if ( stubToGlobalWeakDef && usingDataConst )
+                       return _s_sectionWeak;
+               else if ( stubToResolver && usingDataConst )
+                       return _s_sectionResolver;
+               else
+                       return _s_section;
+       }
+

        const ld::Atom&                                                 _stubTo;
        StubHelperAtom                                                  _helper;
        ResolverHelperAtom                                              _resolverHelper;
        const ld::Atom&                                                 _stubTo;
        StubHelperAtom                                                  _helper;
        ResolverHelperAtom                                              _resolverHelper;


@@ -269,10 +281,14 @@ private:
        
        static ld::Section                                              _s_section;
        static ld::Section                                              _s_sectionClose;
        
        static ld::Section                                              _s_section;
        static ld::Section                                              _s_sectionClose;

+       static ld::Section                                              _s_sectionResolver;
+       static ld::Section                                              _s_sectionWeak;

 };
 
 ld::Section LazyPointerAtom::_s_section("__DATA", "__la_symbol_ptr", ld::Section::typeLazyPointer);
 ld::Section LazyPointerAtom::_s_sectionClose("__DATA", "__lazy_symbol", ld::Section::typeLazyPointerClose);
 };
 
 ld::Section LazyPointerAtom::_s_section("__DATA", "__la_symbol_ptr", ld::Section::typeLazyPointer);
 ld::Section LazyPointerAtom::_s_sectionClose("__DATA", "__lazy_symbol", ld::Section::typeLazyPointerClose);

+ld::Section LazyPointerAtom::_s_sectionResolver("__DATA_DIRTY", "__la_resolver", ld::Section::typeLazyPointer);
+ld::Section LazyPointerAtom::_s_sectionWeak("__DATA", "__la_weak_ptr", ld::Section::typeLazyPointer);

 
 
 class NonLazyPointerAtom : public ld::Atom {
 
 
 class NonLazyPointerAtom : public ld::Atom {


@@ -364,12 +380,12 @@ ld::Section StubPICKextAtom::_s_section("__TEXT", "__stub", ld::Section::typeCod
 class StubPICAtom : public ld::Atom {
 public:
                                                                                        StubPICAtom(ld::passes::stubs::Pass& pass, const ld::Atom& stubTo,
 class StubPICAtom : public ld::Atom {
 public:
                                                                                        StubPICAtom(ld::passes::stubs::Pass& pass, const ld::Atom& stubTo,

-                                                                                                               bool stubToGlobalWeakDef, bool stubToResolver, bool weakImport)
+                                                                                                               bool stubToGlobalWeakDef, bool stubToResolver, bool weakImport, bool usingDataConst)

                                : ld::Atom(_s_section, ld::Atom::definitionRegular, ld::Atom::combineNever,
                                                        ld::Atom::scopeLinkageUnit, ld::Atom::typeStub, 
                                                        symbolTableNotIn, false, false, false, ld::Atom::Alignment(2)), 
                                _stubTo(stubTo), 
                                : ld::Atom(_s_section, ld::Atom::definitionRegular, ld::Atom::combineNever,
                                                        ld::Atom::scopeLinkageUnit, ld::Atom::typeStub, 
                                                        symbolTableNotIn, false, false, false, ld::Atom::Alignment(2)), 
                                _stubTo(stubTo), 

-                               _lazyPointer(pass, stubTo, stubToGlobalWeakDef, stubToResolver, weakImport, false),
+                               _lazyPointer(pass, stubTo, stubToGlobalWeakDef, stubToResolver, weakImport, false, usingDataConst),

                                _fixup1(12, ld::Fixup::k1of4, ld::Fixup::kindSetTargetAddress, &_lazyPointer),
                                _fixup2(12, ld::Fixup::k2of4, ld::Fixup::kindSubtractTargetAddress, this),
                                _fixup3(12, ld::Fixup::k3of4, ld::Fixup::kindSubtractAddend, 12),
                                _fixup1(12, ld::Fixup::k1of4, ld::Fixup::kindSetTargetAddress, &_lazyPointer),
                                _fixup2(12, ld::Fixup::k2of4, ld::Fixup::kindSubtractTargetAddress, this),
                                _fixup3(12, ld::Fixup::k3of4, ld::Fixup::kindSubtractAddend, 12),


@@ -413,7 +429,7 @@ public:
                                                        ld::Atom::scopeLinkageUnit, ld::Atom::typeStub, 
                                                        symbolTableNotIn, false, false, false, ld::Atom::Alignment(2)), 
                                _stubTo(stubTo), 
                                                        ld::Atom::scopeLinkageUnit, ld::Atom::typeStub, 
                                                        symbolTableNotIn, false, false, false, ld::Atom::Alignment(2)), 
                                _stubTo(stubTo), 

-                               _lazyPointer(pass, stubTo, stubToGlobalWeakDef, stubToResolver, weakImport, false),
+                               _lazyPointer(pass, stubTo, stubToGlobalWeakDef, stubToResolver, weakImport, false, false),

                                _fixup(8, ld::Fixup::k1of1, ld::Fixup::kindStoreTargetAddressLittleEndian32, &_lazyPointer) 
                                        { pass.addAtom(*this); }
 
                                _fixup(8, ld::Fixup::k1of1, ld::Fixup::kindStoreTargetAddressLittleEndian32, &_lazyPointer) 
                                        { pass.addAtom(*this); }
 


@@ -451,7 +467,7 @@ public:
                                                        ld::Atom::scopeLinkageUnit, ld::Atom::typeStub, 
                                                        symbolTableNotIn, false, false, false, ld::Atom::Alignment(2)), 
                                _stubTo(stubTo), 
                                                        ld::Atom::scopeLinkageUnit, ld::Atom::typeStub, 
                                                        symbolTableNotIn, false, false, false, ld::Atom::Alignment(2)), 
                                _stubTo(stubTo), 

-                               _lazyPointer(pass, stubTo, stubToGlobalWeakDef, stubToResolver, weakImport, true),
+                               _lazyPointer(pass, stubTo, stubToGlobalWeakDef, stubToResolver, weakImport, true, false),

                                _fixup(0, ld::Fixup::k1of1, ld::Fixup::kindStoreTargetAddressARMLoad12, &_lazyPointer) 
                                { pass.addAtom(*this); }
 
                                _fixup(0, ld::Fixup::k1of1, ld::Fixup::kindStoreTargetAddressARMLoad12, &_lazyPointer) 
                                { pass.addAtom(*this); }