Source-Changes-HG archive

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

[src/trunk]: src/external/bsd/libelf/dist PRIVATE_VERSION(arch) isn't ever us...



details:   https://anonhg.NetBSD.org/src/rev/053f286091c4
branches:  trunk
changeset: 750217:053f286091c4
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Dec 20 19:38:13 2009 +0000

description:
PRIVATE_VERSION(arch) isn't ever used, so don't try to setup this member
of _libelf{}.  ELF??_MACHDEP_ID may not be defined if ELFSIZE wasn't
defined before including this file.

this fixes a build error on mips platforms.

diffstat:

 external/bsd/libelf/dist/libelf.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 990d1364d05b -r 053f286091c4 external/bsd/libelf/dist/libelf.c
--- a/external/bsd/libelf/dist/libelf.c Sun Dec 20 19:06:44 2009 +0000
+++ b/external/bsd/libelf/dist/libelf.c Sun Dec 20 19:38:13 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: libelf.c,v 1.3 2009/12/19 07:52:59 thorpej Exp $       */
+/*     $NetBSD: libelf.c,v 1.4 2009/12/20 19:38:13 mrg Exp $   */
 
 /*-
  * Copyright (c) 2006 Joseph Koshy
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/libelf.c,v 1.1.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $"); */
-__RCSID("$NetBSD: libelf.c,v 1.3 2009/12/19 07:52:59 thorpej Exp $");
+__RCSID("$NetBSD: libelf.c,v 1.4 2009/12/20 19:38:13 mrg Exp $");
 
 #include <sys/param.h>
 
@@ -43,18 +43,16 @@
 
 #if defined(__NetBSD__)
 # if ARCH_ELFSIZE == 64
-#  define ELF_ARCH             ELF64_MACHDEP_ID
 #  define ELF_TARG_DATA                ELF64_MACHDEP_ENDIANNESS
 #  define ELF_TARG_CLASS       ELFCLASS64
 # else
-#  define ELF_ARCH             ELF32_MACHDEP_ID
 #  define ELF_TARG_DATA                ELF32_MACHDEP_ENDIANNESS
 #  define ELF_TARG_CLASS       ELFCLASS32
 # endif /* ARCH_ELFSIZE */
 #endif /* __NetBSD__ */
 
 struct _libelf_globals _libelf = {
-       .libelf_arch            = ELF_ARCH,
+       .libelf_arch            = 0 /* unused - ELF_ARCH */,
        .libelf_byteorder       = ELF_TARG_DATA,
        .libelf_class           = ELF_TARG_CLASS,
        .libelf_error           = 0,



Home | Main Index | Thread Index | Old Index