[src/netbsd-1-5]: src/libexec/ld.elf_so Pull up revision 1.9 (requested by kl...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a57ae03440da
branches:  netbsd-1-5
changeset: 491513:a57ae03440da
user:      he <he%NetBSD.org@localhost>
date:      Tue May 01 12:06:01 2001 +0000

description:
Pull up revision 1.9 (requested by kleink):
  Rename ElfNN_RelA to ElfNN_Rela, which is what SVR4 ABIs and the
  rest of the world uses.  Fixes PR#12274.

diffstat:

 libexec/ld.elf_so/headers.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (61 lines):

diff -r 1ac0c9e1375a -r a57ae03440da libexec/ld.elf_so/headers.c
--- a/libexec/ld.elf_so/headers.c       Tue May 01 12:05:43 2001 +0000
+++ b/libexec/ld.elf_so/headers.c       Tue May 01 12:06:01 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: headers.c,v 1.6.4.1 2000/07/26 23:45:22 mycroft Exp $   */
+/*     $NetBSD: headers.c,v 1.6.4.2 2001/05/01 12:06:01 he Exp $        */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -88,7 +88,7 @@
                                obj->pltrel = (const Elf_Rel *)
                                    (obj->relocbase + dynp->d_un.d_ptr);
                        } else {
-                               obj->pltrela = (const Elf_RelA *)
+                               obj->pltrela = (const Elf_Rela *)
                                    (obj->relocbase + dynp->d_un.d_ptr);
                        }
                        break;
@@ -98,7 +98,7 @@
                        break;
 
                case DT_RELA:
-                       obj->rela = (const Elf_RelA *)
+                       obj->rela = (const Elf_Rela *)
                            (obj->relocbase + dynp->d_un.d_ptr);
                        break;
 
@@ -107,7 +107,7 @@
                        break;
 
                case DT_RELAENT:
-                       assert(dynp->d_un.d_val == sizeof(Elf_RelA));
+                       assert(dynp->d_un.d_val == sizeof(Elf_Rela));
                        break;
 
                case DT_PLTREL:
@@ -121,7 +121,7 @@
                         * We want the DT_JMPREL which points to our jump table.
                         */
                        if (plttype == DT_RELA) {
-                               obj->pltrela = (const Elf_RelA *) obj->pltrel;
+                               obj->pltrela = (const Elf_Rela *) obj->pltrel;
                                obj->pltrel = NULL;
                        }
 #endif
@@ -237,13 +237,13 @@
        }
 
        obj->rellim = (const Elf_Rel *)((caddr_t)obj->rel + relsz);
-       obj->relalim = (const Elf_RelA *)((caddr_t)obj->rela + relasz);
+       obj->relalim = (const Elf_Rela *)((caddr_t)obj->rela + relasz);
        if (plttype == DT_REL) {
                obj->pltrellim = (const Elf_Rel *)((caddr_t)obj->pltrel + pltrelsz);
                obj->pltrelalim = 0;
        } else {
                obj->pltrellim = 0;
-               obj->pltrelalim = (const Elf_RelA *)((caddr_t)obj->pltrela + pltrelsz);
+               obj->pltrelalim = (const Elf_Rela *)((caddr_t)obj->pltrela + pltrelsz);
        }
 
        if (dyn_rpath != NULL) {