--- Libc/Libc-498/ppc/sys/setjmp.s
+++ Libc/Libc-262/ppc/sys/setjmp.s
@@ -3,20 +3,19 @@
  *
  * @APPLE_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.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource 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
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -34,14 +33,8 @@
  *		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"
 
 /*
@@ -50,39 +43,26 @@
 
 /*	int sigsetjmp(sigjmp_buf env, int savemask); */
 
-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()
+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()
 	; else *** fall through ***  to setjmp()
 
 /*	int setjmp(jmp_buf env); */
 
-MI_ENTRY_POINT(_setjmp)
-	mflr    r0
-	stg     r31, JMP_r31(r3)
-	stg     r0, JMP_lr(r3)
-	mr      r31, r3			; save ptr to jmpbuf across calls
-	
-	/* call sigprocmask() to get signal mask */
-	
-	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
-	
-	/* call sigaltstack() to get SS_ONSTACK flag */
-	
-	li	r3,0			; ss is NULL
-	la	r4,JMP_vr_base_addr(r31); oss is a temp buffer in jmp_buf
-	MI_CALL_EXTERNAL(_sigaltstack)	; make a syscall to get current stack state
-	la	r4,JMP_vr_base_addr(r31); recreate temp buffer ptr
-	lwz	r5,2*GPR_BYTES(r4)	; get ss_flags (an int) from stack_t
-	stw	r5,JMP_ss_flags(r31)	; save ss_flags in jmp_buf
-	
-	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)
+LEAF(_setjmp)
+L_setjmp:
+	mflr r0
+	stw r31, JMP_r31(r3)
+	stw r0, JMP_lr(r3)
+	mr r31, r3
+	li r3, 0				; get the previous signal mask
+	CALL_EXTERN(_sigblock)
+	stw r3, JMP_sig(r31)	; save the previous mask
+	mr r3, r31
+	lwz r0, JMP_lr(r3)
+	mtlr r0
+	lwz r31, JMP_r31(r3)
+L__setjmp:
+	BRANCH_EXTERN(__setjmp)