--- Libc/Libc-320/ppc/sys/setjmp.s
+++ Libc/Libc-391/ppc/sys/setjmp.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
@@ -36,8 +34,14 @@
  *		Created. Derived from _setjmp.s, setjmp.c and setjmp.s
  */
 
+/* We use mode-independent "g" opcodes such as "stg", 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>
+
 #include "SYS.h"
-#include <architecture/ppc/asm_help.h>
 #include "_setjmp.h"
 
 /*
@@ -46,27 +50,26 @@
 
 /*	int sigsetjmp(sigjmp_buf env, int savemask); */
 
-LEAF(_sigsetjmp)
-	cmpwi cr1,r4,0			; this changes cr1[EQ] which is volatile
-	stw r4, JMP_SIGFLAG(r3)	; save the sigflag for use by siglongjmp()
-	beq- cr1, L__setjmp		; if r4 == 0 do _setjmp()
+MI_ENTRY_POINT(_sigsetjmp)
+	cmpgi   cr1,r4,0			; this changes cr1 which is volatile
+	stg     r4, JMP_SIGFLAG(r3)	; save the sigflag for use by siglongjmp()
+	beq--   cr1, L__exit		; if r4 == 0 do _setjmp()
 	; else *** fall through ***  to setjmp()
 
 /*	int setjmp(jmp_buf env); */
 
-LEAF(_setjmp)
-L_setjmp:
-	mflr r0
-	stw r31, JMP_r31(r3)
-	stw r0, JMP_lr(r3)
-	mr r31, r3
-	li r3, 1				; get the previous signal mask
-	li r4, 0
-	la r5, JMP_sig(r31)	; get address where previous mask needs to be
-	CALL_EXTERN(_sigprocmask)
-	mr r3, r31
-	lwz r0, JMP_lr(r3)
-	mtlr r0
-	lwz r31, JMP_r31(r3)
-L__setjmp:
-	BRANCH_EXTERN(__setjmp)
+MI_ENTRY_POINT(_setjmp)
+	mflr    r0
+	stg     r31, JMP_r31(r3)
+	stg     r0, JMP_lr(r3)
+	mr      r31, r3             ; save ptr to jmpbuf across call
+	li      r3, 1				; get the previous signal mask
+	li      r4, 0
+	la      r5, JMP_sig(r31)	; get address where previous mask needs to be
+	MI_CALL_EXTERNAL(_sigprocmask) // make a syscall to get mask
+	mr      r3, r31             ; restore jmp_buf ptr
+	lg      r0, JMP_lr(r31)
+	lg      r31, JMP_r31(r31)
+	mtlr    r0
+L__exit:
+	MI_BRANCH_EXTERNAL(__setjmp)