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 49d76a4f8f8cce385b30f9bf96719a8d1ed9ad4c..2b2bdc68843c604eb636d56178e345207087784a 100644 (file)
--- a/libkern/kmod/cplus_stop.c
+++ b/libkern/kmod/cplus_stop.c
@@ -1,14 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000,2008-2009 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
     Subtle combination of files and libraries make up the C++ runtime system for kernel modules.  We are dependant on the KernelModule kmod.make and CreateKModInfo.perl scripts to be exactly instep with both this library module and the libkmod module as well.
@@ -37,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");
@@ -50,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