Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/ld.elf_so/arch Make DEBUG build compile.



details:   https://anonhg.NetBSD.org/src/rev/1d92a944e82a
branches:  trunk
changeset: 750788:1d92a944e82a
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Jan 14 12:12:07 2010 +0000

description:
Make DEBUG build compile.

diffstat:

 libexec/ld.elf_so/arch/arm/mdreloc.c    |  6 +++---
 libexec/ld.elf_so/arch/x86_64/mdreloc.c |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r c97eaa02a016 -r 1d92a944e82a libexec/ld.elf_so/arch/arm/mdreloc.c
--- a/libexec/ld.elf_so/arch/arm/mdreloc.c      Thu Jan 14 12:01:58 2010 +0000
+++ b/libexec/ld.elf_so/arch/arm/mdreloc.c      Thu Jan 14 12:12:07 2010 +0000
@@ -1,8 +1,8 @@
-/*     $NetBSD: mdreloc.c,v 1.32 2010/01/14 11:57:06 skrll Exp $       */
+/*     $NetBSD: mdreloc.c,v 1.33 2010/01/14 12:12:07 skrll Exp $       */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.32 2010/01/14 11:57:06 skrll Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.33 2010/01/14 12:12:07 skrll Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -227,7 +227,7 @@
        const Obj_Entry *defobj;
        unsigned long info = rel->r_info;
 
-       assert(ELF_R_TYPE(info) == R_TYPE(JMP_SLOT));
+       assert(ELF_R_TYPE(info) == R_TYPE(JUMP_SLOT));
 
        def = _rtld_find_plt_symdef(ELF_R_SYM(info), obj, &defobj, tp != NULL);
        if (__predict_false(def == NULL))
diff -r c97eaa02a016 -r 1d92a944e82a libexec/ld.elf_so/arch/x86_64/mdreloc.c
--- a/libexec/ld.elf_so/arch/x86_64/mdreloc.c   Thu Jan 14 12:01:58 2010 +0000
+++ b/libexec/ld.elf_so/arch/x86_64/mdreloc.c   Thu Jan 14 12:12:07 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mdreloc.c,v 1.36 2010/01/13 20:17:23 christos Exp $    */
+/*     $NetBSD: mdreloc.c,v 1.37 2010/01/14 12:14:49 skrll Exp $       */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -68,7 +68,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.36 2010/01/13 20:17:23 christos Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.37 2010/01/14 12:14:49 skrll Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -261,7 +261,7 @@
        const Obj_Entry *defobj;
        unsigned long info = rela->r_info;
 
-       assert(ELF_R_TYPE(info) == R_TYPE(JMP_SLOT));
+       assert(ELF_R_TYPE(info) == R_TYPE(JUMP_SLOT));
 
        def = _rtld_find_plt_symdef(ELF_R_SYM(info), obj, &defobj, tp != NULL);
        if (__predict_false(def == NULL))



Home | Main Index | Thread Index | Old Index