This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
[PATCH] Handle R_SPARC_UA{16,32} in ld.so
- To: Ulrich Drepper <drepper at redhat dot com>, "David S. Miller" <davem at redhat dot com>
- Subject: [PATCH] Handle R_SPARC_UA{16,32} in ld.so
- From: Jakub Jelinek <jakub at redhat dot com>
- Date: Mon, 2 Jul 2001 07:28:54 -0400
- Cc: Ian Lance Taylor <ian at zembu dot com>, GNU C Library <libc-alpha at sourceware dot cygnus dot com>
- References: <15163.43942.129113.136647@pizda.ninka.net> <20010628151740.A16519@redhat.com> <15163.44509.408432.791384@pizda.ninka.net> <si7kxw1bca.fsf@daffy.airs.com> <15163.45804.596214.835449@pizda.ninka.net> <20010629071648.D1195@sunsite.ms.mff.cuni.cz> <20010629150510.F18986@bubble.local> <20010629122618.B737@sunsite.ms.mff.cuni.cz> <siithfxmie.fsf@daffy.airs.com> <15164.61816.673999.392746@pizda.ninka.net>
- Reply-To: Jakub Jelinek <jakub at redhat dot com>
On Fri, Jun 29, 2001 at 02:22:00PM -0700, David S. Miller wrote:
>
> Ian Lance Taylor writes:
> > Jakub Jelinek <jakub@redhat.com> writes:
> > > As far as glibc is concerned, if you show me a real-world DSO which really
> > > needs R_SPARC_UA16 or R_SPARC_UA32, then I'll happily add those relocs to
> > > sparc/sparc32/dl-machine.h, but the libstdc++ Artur mailed me had just
> > > R_SPARC_UA32 with all r_offsets divisible by 4.
> >
> > Do it now. Why wait until somebody has trouble? It's probably easy
> > to create a C test case using attribute((__packed__)).
>
> Jakub, Ian is right. Even though such examples are silly, they are
> technically legal.
Agreed.
Uli, can you please check this in?
2001-07-02 Jakub Jelinek <jakub@redhat.com>
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Handle
R_SPARC_UA16 and R_SPARC_UA32.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise.
--- libc/sysdeps/sparc/sparc32/dl-machine.h.jj Mon Mar 12 10:56:20 2001
+++ libc/sysdeps/sparc/sparc32/dl-machine.h Mon Jul 2 13:30:09 2001
@@ -434,6 +434,16 @@ elf_machine_rela (struct link_map *map,
case R_SPARC_HI22:
*reloc_addr = (*reloc_addr & 0xffc00000) | (value >> 10);
break;
+ case R_SPARC_UA16:
+ ((unsigned char *) reloc_addr) [0] = value >> 8;
+ ((unsigned char *) reloc_addr) [1] = value;
+ break;
+ case R_SPARC_UA32:
+ ((unsigned char *) reloc_addr) [0] = value >> 24;
+ ((unsigned char *) reloc_addr) [1] = value >> 16;
+ ((unsigned char *) reloc_addr) [2] = value >> 8;
+ ((unsigned char *) reloc_addr) [3] = value;
+ break;
#endif
case R_SPARC_NONE: /* Alright, Wilbur. */
break;
--- libc/sysdeps/sparc/sparc64/dl-machine.h.jj Sat May 5 15:47:37 2001
+++ libc/sysdeps/sparc/sparc64/dl-machine.h Mon Jul 2 13:29:03 2001
@@ -338,6 +338,16 @@ elf_machine_rela (struct link_map *map,
elf_machine_fixup_plt(map, 0, reloc, reloc_addr, value);
break;
#ifndef RTLD_BOOTSTRAP
+ case R_SPARC_UA16:
+ ((unsigned char *) reloc_addr) [0] = value >> 8;
+ ((unsigned char *) reloc_addr) [1] = value;
+ break;
+ case R_SPARC_UA32:
+ ((unsigned char *) reloc_addr) [0] = value >> 24;
+ ((unsigned char *) reloc_addr) [1] = value >> 16;
+ ((unsigned char *) reloc_addr) [2] = value >> 8;
+ ((unsigned char *) reloc_addr) [3] = value;
+ break;
case R_SPARC_UA64:
if (! ((long) reloc_addr & 3))
{
Jakub