This is the mail archive of the mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Don't compile _dl_resolve_conflicts if there's no RELA support

_dl_resolve_conflicts assumes elf_machine_rela exists, and it's only
called in rtld.c in a chunk of code that is protected by
`! ELF_MACHINE_NO_RELA' as well.  Ok to install?

Index: ChangeLog
from  Alexandre Oliva  <aoliva at redhat dot com>

	* elf/dl-conflict.c: Don't compile _dl_resolve_conflicts if

Index: elf/dl-conflict.c
RCS file: /cvs/glibc/libc/elf/dl-conflict.c,v
retrieving revision 1.8
diff -u -p -r1.8 dl-conflict.c
--- elf/dl-conflict.c 17 Oct 2002 12:09:48 -0000 1.8
+++ elf/dl-conflict.c 14 Mar 2003 00:55:19 -0000
@@ -1,5 +1,5 @@
 /* Resolve conflicts against already prelinked libraries.
-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2001, 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub at redhat dot com>, 2001.
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include "dynamic-link.h"
 _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict,
 		       ElfW(Rela) *conflictend)
@@ -65,3 +65,4 @@ _dl_resolve_conflicts (struct link_map *
       elf_machine_rela (l, conflict, NULL, NULL, (void *) conflict->r_offset);
Alexandre Oliva   Enjoy Guarana', see
Red Hat GCC Developer                 aoliva at {redhat dot com,}
CS PhD student at IC-Unicamp        oliva at {lsd dot ic dot unicamp dot br,}
Free Software Evangelist                Professional serial bug killer

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]