ObjFW  Check-in [e933229b5a]

Overview
Comment:Fix workaround for missing blx on ARM
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: e933229b5af1621b813cd55856927ea8543dcf71cced05ed2544c8ab8dbbe2fe
User & Date: js on 2024-05-13 21:08:06
Other Links: manifest | tags
Context
2024-05-22
19:24
Fix workaround for missing blx on ARM check-in: cc826fdb6d user: js tags: 1.1
2024-05-13
22:03
Clean up ObjFWTest Makefile check-in: 7c0575d78f user: js tags: trunk
21:08
Fix workaround for missing blx on ARM check-in: e933229b5a user: js tags: trunk
2024-05-12
15:48
ofarc: Fix extracting from stdin on macOS check-in: 5923676ca6 user: js tags: trunk
Changes

Modified src/forwarding/forwarding-arm-elf.S from [0367f22137] to [f6b2ed20ca].

54
55
56
57
58
59
60

61
62
63
64
65
66
67
68
	mov	r12, r0
	ldr	r0, [sp, #0]
	mov	r1, r4
	ldr	r2, [sp, #4]
#ifdef HAVE_BLX
	blx	r12
#else

	bl	r12
#endif

	cmp	r0, #0
	beq	0f
	ldr	r1, [sp, #0]
	cmp	r0, r1
	beq	0f







>
|







54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
	mov	r12, r0
	ldr	r0, [sp, #0]
	mov	r1, r4
	ldr	r2, [sp, #4]
#ifdef HAVE_BLX
	blx	r12
#else
	mov	lr, pc
	bx	r12
#endif

	cmp	r0, #0
	beq	0f
	ldr	r1, [sp, #0]
	cmp	r0, r1
	beq	0f
114
115
116
117
118
119
120

121
122
123
124
125
126
127
128
	mov	r12, r0
	ldr	r0, [sp, #4]
	mov	r1, r4
	ldr	r2, [sp, #8]
#ifdef HAVE_BLX
	blx	r12
#else

	bl	r12
#endif

	cmp	r0, #0
	beq	0f
	ldr	r1, [sp, #4]
	cmp	r0, r1
	beq	0f







>
|







115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
	mov	r12, r0
	ldr	r0, [sp, #4]
	mov	r1, r4
	ldr	r2, [sp, #8]
#ifdef HAVE_BLX
	blx	r12
#else
	mov	lr, pc
	bx	r12
#endif

	cmp	r0, #0
	beq	0f
	ldr	r1, [sp, #4]
	cmp	r0, r1
	beq	0f