xnu-1699.22.73.tar.gz

[apple/xnu.git] / libkern / kmod / cplus_stop.c

diff --git a/libkern/kmod/cplus_stop.c b/libkern/kmod/cplus_stop.c
index fffd04044d537a570d72710f0810d73dbc0e1b3f..2b2bdc68843c604eb636d56178e345207087784a 100644 (file)
--- a/libkern/kmod/cplus_stop.c
+++ b/libkern/kmod/cplus_stop.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000,2008-2009 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -42,6 +42,12 @@
     The linkline must look like this.
         *.o -lkmodc++ kmod_info.o -lkmod
  */
+
+/* The following preprocessor test must match exactly with the architectures
+ * that define the CONFIG_STATIC_CPPINIT config option.
+ */
+#if __i386__
+
 #include <mach/mach_types.h>
 
 asm(".destructors_used = 0");
@@ -55,10 +61,16 @@ extern kmod_stop_func_t *_antimain;
 
 __private_extern__ kern_return_t _stop(kmod_info_t *ki, void *data)
 {
-    kern_return_t res = OSRuntimeFinalizeCPP(ki, data);
-
-    if (!res && _antimain)
-        res = (*_antimain)(ki, data);
+    kern_return_t result = KERN_SUCCESS;
 
-    return res;
+    if (_antimain) {
+        result = (*_antimain)(ki, data);
+    }
+    
+    if (result == KERN_SUCCESS) {
+        result = OSRuntimeFinalizeCPP(ki, data);
+    }
+    
+    return result;
 }
+#endif