View | Details | Raw Unified | Return to bug 268521 | Differences between
and this patch

Collapse All | Expand All

(-)b/lib/libc/aarch64/gen/_setjmp.S (-2 / +6 lines)
Lines 90-97 ENTRY(_longjmp) Link Here
90
	ldp	d14, d15, [x0]
90
	ldp	d14, d15, [x0]
91
#endif
91
#endif
92
92
93
	/* Load the return value */
93
	/*
94
	mov	x0, x1
94
	 * Load the return value.
95
	 * If the value is 0, longjmp should make setjmp() return 1, not 0.
96
	 */
97
	cmp	x1, #0
98
	csinc	x0, x1, xzr, ne
95
	ret
99
	ret
96
100
97
botch:
101
botch:
(-)b/lib/libc/aarch64/gen/setjmp.S (-3 / +6 lines)
Lines 112-119 ENTRY(longjmp) Link Here
112
	ldp	d12, d13, [x0], #16
112
	ldp	d12, d13, [x0], #16
113
	ldp	d14, d15, [x0]
113
	ldp	d14, d15, [x0]
114
114
115
	/* Load the return value */
115
	/*
116
	mov	x0, x1
116
	 * Load the return value.
117
	 * If the value is 0, longjmp should make setjmp() return 1, not 0.
118
	 */
119
	cmp	x1, #0
120
	csinc	x0, x1, xzr, ne
117
	ret
121
	ret
118
122
119
botch:
123
botch:
120
- 

Return to bug 268521