--- Libc/Libc-320/ppc/sys/cerror.s
+++ Libc/Libc-391/ppc/sys/cerror.s
@@ -2,8 +2,6 @@
  * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
@@ -25,15 +23,40 @@
 /* Copyright (c) 1992 NeXT Computer, Inc.  All rights reserved.
  */
 
-#import	<architecture/ppc/asm_help.h>
-#import	<architecture/ppc/pseudo_inst.h>
+/* We use mode-independent "g" opcodes such as "srgi", and/or
+ * mode-independent macros such as MI_GET_ADDRESS.  These expand
+ * into word operations when targeting __ppc__, and into doubleword
+ * operations when targeting __ppc64__.
+ */
+#include <architecture/ppc/mode_independent_asm.h>
 
-	.globl	_errno
+    .globl  _errno
 
-NESTED(cerror, 0, 1, 0, 0)
-	REG_TO_EXTERN(r3,_errno)
-	CALL_EXTERN(_cthread_set_errno_self)
-	li32	r3,-1
-	li32	r4,-1	/* in case a 64-bit value is returned */
-	RETURN
-END(cerror)
+#if 0
+MI_ENTRY_POINT(cerror_cvt)
+    MI_PUSH_STACK_FRAME
+    MI_GET_ADDRESS(r12,_errno)
+    cmplwi  r3,102		    /* EOPNOTSUPP? */
+    bne     1f
+    li	    r3,45		    /* Yes; make ENOTSUP for compatibility */
+1:
+    stw     r3,0(r12)               /* save syscall return code in global */
+    MI_CALL_EXTERNAL(_cthread_set_errno_self)
+    li      r3,-1                   /* then bug return value */
+    li      r4,-1                   /* in case we're returning a long-long in 32-bit mode, etc */
+    MI_POP_STACK_FRAME_AND_RETURN
+#endif
+
+MI_ENTRY_POINT(cerror_cvt)
+    cmplwi  r3,102		    /* EOPNOTSUPP? */
+    bne     1f
+    li	    r3,45		    /* Yes; make ENOTSUP for compatibility */
+1:
+MI_ENTRY_POINT(cerror)
+    MI_PUSH_STACK_FRAME
+    MI_GET_ADDRESS(r12,_errno)
+    stw     r3,0(r12)               /* save syscall return code in global */
+    MI_CALL_EXTERNAL(_cthread_set_errno_self)
+    li      r3,-1                   /* then bug return value */
+    li      r4,-1                   /* in case we're returning a long-long in 32-bit mode, etc */
+    MI_POP_STACK_FRAME_AND_RETURN