From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12022 invoked by alias); 29 Apr 2004 18:53:17 -0000 Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sources.redhat.com Received: (qmail 12006 invoked from network); 29 Apr 2004 18:53:17 -0000 Received: from unknown (HELO mta05-svc.ntlworld.com) (62.253.162.45) by sources.redhat.com with SMTP; 29 Apr 2004 18:53:17 -0000 Received: from dixie.nexus.co.uk ([81.96.69.80]) by mta05-svc.ntlworld.com (InterMail vM.4.01.03.37 201-229-121-137-20020806) with ESMTP id <20040429185150.VRPH1012.mta05-svc.ntlworld.com@dixie.nexus.co.uk> for ; Thu, 29 Apr 2004 19:51:50 +0100 Received: from localhost ([127.0.0.1]) by dixie.nexus.co.uk with esmtp (Exim 3.36 #1 (Debian)) id 1BJGel-00064B-00 for ; Thu, 29 Apr 2004 19:53:11 +0100 Subject: patch for arm dl-machine.h From: Philip Blundell To: libc-hacker@sources.redhat.com Content-Type: multipart/mixed; boundary="=-qtAab02yAOea3tUaK/Uw" Message-Id: <1083264791.24915.1.camel@dixie.nexus.co.uk> Mime-Version: 1.0 Date: Thu, 29 Apr 2004 18:53:00 -0000 X-SW-Source: 2004-04/txt/msg00096.txt.bz2 --=-qtAab02yAOea3tUaK/Uw Content-Type: text/plain Content-Transfer-Encoding: 7bit Content-length: 65 This patch improves the startup code for ARM a bit. Thanks p. --=-qtAab02yAOea3tUaK/Uw Content-Disposition: attachment; filename=dl-machine.patch Content-Type: text/x-patch; name=dl-machine.patch; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-length: 2404 2004-04-29 Philip Blundell * sysdeps/arm/dl-machine.h (RTLD_START): Avoid unnecessary GOT entries. Index: sysdeps/arm/dl-machine.h =================================================================== RCS file: /cvs/glibc/libc/sysdeps/arm/dl-machine.h,v retrieving revision 1.47 diff -u -r1.47 dl-machine.h --- sysdeps/arm/dl-machine.h 22 Apr 2004 07:31:08 -0000 1.47 +++ sysdeps/arm/dl-machine.h 29 Apr 2004 13:08:23 -0000 @@ -255,26 +255,27 @@ .globl _start\n\ .globl _dl_start_user\n\ _start:\n\ + @ we are PIC code, so get global offset table\n\ + ldr sl, .L_GET_GOT\n\ + @ See if we were run as a command with the executable file\n\ + @ name as an extra leading argument.\n\ + ldr r4, .L_SKIP_ARGS\n\ @ at start time, all the args are on the stack\n\ mov r0, sp\n\ bl _dl_start\n\ @ returns user entry point in r0\n\ _dl_start_user:\n\ - mov r6, r0\n\ - @ we are PIC code, so get global offset table\n\ - ldr sl, .L_GET_GOT\n\ add sl, pc, sl\n\ .L_GOT_GOT:\n\ - @ See if we were run as a command with the executable file\n\ - @ name as an extra leading argument.\n\ - ldr r4, .L_SKIP_ARGS\n\ ldr r4, [sl, r4]\n\ @ get the original arg count\n\ ldr r1, [sp]\n\ - @ subtract _dl_skip_args from it\n\ - sub r1, r1, r4\n\ - @ adjust the stack pointer to skip them\n\ + @ save the entry point in another register\n\ + mov r6, r0\n\ + @ adjust the stack pointer to skip the extra args\n\ add sp, sp, r4, lsl #2\n\ + @ subtract _dl_skip_args from original arg count\n\ + sub r1, r1, r4\n\ @ get the argv address\n\ add r2, sp, #4\n\ @ store the new argc in the new stack location\n\ @@ -286,29 +287,21 @@ @ now we call _dl_init\n\ ldr r0, .L_LOADED\n\ ldr r0, [sl, r0]\n\ - ldr r0, [r0]\n\ @ call _dl_init\n\ bl _dl_init_internal(PLT)\n\ - @ clear the startup flag\n\ - ldr r2, .L_STARTUP_FLAG\n\ - ldr r1, [sl, r2]\n\ - mov r0, #0\n\ - str r0, [r1]\n\ @ load the finalizer function\n\ ldr r0, .L_FINI_PROC\n\ - ldr r0, [sl, r0]\n\ + add r0, sl, r0\n\ @ jump to the user_s entry point\n\ mov pc, r6\n\ .L_GET_GOT:\n\ .word _GLOBAL_OFFSET_TABLE_ - .L_GOT_GOT - 4\n\ .L_SKIP_ARGS:\n\ .word _dl_skip_args(GOTOFF)\n\ -.L_STARTUP_FLAG:\n\ - .word _dl_starting_up(GOT)\n\ .L_FINI_PROC:\n\ - .word _dl_fini(GOT)\n\ + .word _dl_fini(GOTOFF)\n\ .L_LOADED:\n\ - .word _rtld_local(GOT)\n\ + .word _rtld_local(GOTOFF)\n\ .previous\n\ "); --=-qtAab02yAOea3tUaK/Uw--