[04/17] csky: Remove _dl_skip_args usage

Message ID 20220526165003.705355-5-adhemerval.zanella@linaro.org
State Committed
Commit 00477963c6a5abd3075044f180d4d0d122a77de0
Headers
Series Remove _dl_skip_args |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Adhemerval Zanella May 26, 2022, 4:49 p.m. UTC
  Since ad43cac44a the generic code already shuffles the argv/envp/auxv
on the stack to remove the ld.so own arguments and thus _dl_skip_args
is always 0.  It makes the fixup_stack branch ununsed.
---
 sysdeps/csky/dl-machine.h | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)
  

Patch

diff --git a/sysdeps/csky/dl-machine.h b/sysdeps/csky/dl-machine.h
index f81448a141..48787ce3c7 100644
--- a/sysdeps/csky/dl-machine.h
+++ b/sysdeps/csky/dl-machine.h
@@ -113,11 +113,7 @@  _start:\n\
 	addu	t1, gb\n\
 	jsr	t1\n\
 _dl_start_user:\n\
-	/* get _dl_skip_args */    \n\
-	lrw	r11, _dl_skip_args@GOTOFF\n\
-	addu	r11, gb\n\
-	ldw	r11, (r11, 0)\n\
-	/* store program entry address in r11 */ \n\
+	/* store program entry address in r10 */ \n\
 	mov	r10, a0\n\
 	/* Get argc */\n\
 	ldw	a1, (sp, 0)\n\
@@ -125,8 +121,6 @@  _dl_start_user:\n\
 	mov	a2, sp\n\
 	addi	a2, 4\n\
 	cmpnei	r11, 0\n\
-	bt	.L_fixup_stack\n\
-.L_done_fixup:\n\
 	mov	a3, a1\n\
 	lsli	a3, 2\n\
 	add	a3, a2\n\
@@ -141,17 +135,6 @@  _dl_start_user:\n\
 	lrw	a0, _dl_fini@GOTOFF\n\
 	addu	a0, gb\n\
 	jmp	r10\n\
-.L_fixup_stack:\n\
-	subu	a1, r11\n\
-	lsli	r11, 2\n\
-	addu	sp, r11\n\
-	stw	a1, (sp, 0)\n\
-	mov	a2, sp\n\
-	addi	a2, 4\n\
-	lrw	a3, _dl_argv@GOTOFF\n\
-	addu	a3, gb\n\
-	stw	a2, (a3, 0)\n\
-	br	.L_done_fixup\n\
 ");
 
 /* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry or