Changeset 2964 for trunk/kLdr/kLdrModMachO.c

Timestamp:

Feb 13, 2007, 11:40:35 AM (19 years ago)

Author:

bird

Message:

literals and ignore weaks.

File:

• trunk/kLdr/kLdrModMachO.c (modified) (5 diffs)

trunk/kLdr/kLdrModMachO.c

@@ -557 +557 @@
                         case S_CSTRING_LITERALS:
                         case S_COALESCED:
+                        case S_4BYTE_LITERALS:
+                        case S_8BYTE_LITERALS:
+                        case S_16BYTE_LITERALS:
                             if (pSect->reserved1 || pSect->reserved2)
                                 return KLDR_ERR_MACHO_BAD_SECTION;
@@ -567 +570 @@
                         case S_NON_LAZY_SYMBOL_POINTERS:
                         case S_LAZY_SYMBOL_POINTERS:
-                        case S_4BYTE_LITERALS:
-                        case S_8BYTE_LITERALS:
-                        case S_16BYTE_LITERALS:
                         case S_SYMBOL_STUBS:
                         case S_MOD_INIT_FUNC_POINTERS:
@@ -1767 +1767 @@
             }
             else if (paSyms[iSym].n_desc & N_WEAK_DEF)
-                return KLDR_ERR_TODO; /** @todo implement weak symbols. */
+            {
+                /** @todo implement weak symbols. */
+                /*return KLDR_ERR_TODO; - ignored for now. */
+            }
         }
     }
@@ -1815 +1818 @@
             }
             else if (paSyms[iSym].n_desc & N_WEAK_DEF)
-                return KLDR_ERR_TODO; /** @todo implement weak symbols. */
+            {
+                /** @todo implement weak symbols. */
+                /*return KLDR_ERR_TODO; - ignored for now. */
+            }
         }
     }
@@ -2078 +2084 @@
         }
         else if (Fixup.r.r_type <= GENERIC_RELOC_LOCAL_SECTDIFF)
-            return KLDR_ERR_TODO;
+            return KLDR_ERR_MACHO_UNSUPPORTED_FIXUP_TYPE;
         else
             return KLDR_ERR_BAD_FIXUP;