Module Name:    src
Committed By:   christos
Date:           Wed Mar 27 21:53:06 UTC 2024

Modified Files:
        src/external/bsd/elftoolchain/dist/libdwarf: libdwarf_reloc.c

Log Message:
Don't try to compile the arch-specific relocation code if we don't have the
built-in headers (for tools)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
    src/external/bsd/elftoolchain/dist/libdwarf/libdwarf_reloc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/elftoolchain/dist/libdwarf/libdwarf_reloc.c
diff -u src/external/bsd/elftoolchain/dist/libdwarf/libdwarf_reloc.c:1.5 src/external/bsd/elftoolchain/dist/libdwarf/libdwarf_reloc.c:1.6
--- src/external/bsd/elftoolchain/dist/libdwarf/libdwarf_reloc.c:1.5	Sun Mar  3 12:37:32 2024
+++ src/external/bsd/elftoolchain/dist/libdwarf/libdwarf_reloc.c	Wed Mar 27 17:53:06 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: libdwarf_reloc.c,v 1.5 2024/03/03 17:37:32 christos Exp $	*/
+/*	$NetBSD: libdwarf_reloc.c,v 1.6 2024/03/27 21:53:06 christos Exp $	*/
 
 /*-
  * Copyright (c) 2010 Kai Wang
@@ -28,7 +28,7 @@
 
 #include "_libdwarf.h"
 
-__RCSID("$NetBSD: libdwarf_reloc.c,v 1.5 2024/03/03 17:37:32 christos Exp $");
+__RCSID("$NetBSD: libdwarf_reloc.c,v 1.6 2024/03/27 21:53:06 christos Exp $");
 ELFTC_VCSID("Id: libdwarf_reloc.c 3741 2019-06-07 06:32:01Z jkoshy");
 
 Dwarf_Unsigned
@@ -36,7 +36,7 @@ _dwarf_get_reloc_type(Dwarf_P_Debug dbg,
 {
 
 	assert(dbg != NULL);
-
+#ifdef BUILTIN_ELF_HEADERS
 	switch (dbg->dbgp_isa) {
 	case DW_ISA_AARCH64:
 		return (is64 ? R_AARCH64_ABS64 : R_AARCH64_ABS32);
@@ -59,6 +59,7 @@ _dwarf_get_reloc_type(Dwarf_P_Debug dbg,
 	default:
 		break;
 	}
+#endif
 	return (0);		/* NOT REACHED */
 }
 
@@ -66,6 +67,7 @@ int
 _dwarf_get_reloc_size(Dwarf_Debug dbg, Dwarf_Unsigned rel_type)
 {
 
+#ifdef BUILTIN_ELF_HEADERS
 	switch (dbg->dbg_machine) {
 	case EM_NONE:
 		break;
@@ -127,6 +129,7 @@ _dwarf_get_reloc_size(Dwarf_Debug dbg, D
 	default:
 		break;
 	}
+#endif
 
 	/* unknown relocation. */
 	return (0);

Reply via email to