ld64-133.3.tar.gz

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

diff --git a/src/ld/passes/order.cpp b/src/ld/passes/order.cpp
index ce17a35c0fe8786957e8debf58008af6e68784b4..6876d8f6659f397727673ee3d68fd6acf436b6bd 100644 (file)
--- a/src/ld/passes/order.cpp
+++ b/src/ld/passes/order.cpp
@@ -193,8 +193,9 @@ bool Layout::Comparer::operator()(const ld::Atom* left, const ld::Atom* right)
        // sort by .o order
        const ld::File* leftFile = left->file();
        const ld::File* rightFile = right->file();
-       uint32_t leftFileOrdinal = (leftFile != NULL) ? leftFile->ordinal() : 0;
-       uint32_t rightFileOrdinal = (rightFile != NULL) ? rightFile->ordinal() : 0;
+       // <rdar://problem/10830126> properly sort if on file is NULL and the other is not
+       ld::File::Ordinal leftFileOrdinal = (leftFile != NULL) ? leftFile->ordinal() : ld::File::Ordinal::NullOrdinal();
+       ld::File::Ordinal rightFileOrdinal = (rightFile != NULL) ? rightFile->ordinal() : ld::File::Ordinal::NullOrdinal();
        if ( leftFileOrdinal != rightFileOrdinal )
                return leftFileOrdinal< rightFileOrdinal;