Mon May 2 20:09:48 2022 UTC ()

Follow FreeBSD revision <0e15d9fbeba4> and simplify #ifdef'ed code.

This change avoids redefining 'SHN_SUNW_IGNORE' if the symbol is already
present.


(jkoshy)

diff -r1.12 -r1.13 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c

--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c 2019/12/03 22:10:56	1.12
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c 2022/05/02 20:09:48	1.13

 @@ -1668,31 +1668,28 @@ process_obj(dtrace_hdl_t *dtp, const cha
+			}
 #endif
 			mod = 1;
 			(void) elf_flagdata(data_tgt, ELF_C_SET, ELF_F_DIRTY);
 			/*
 			 * This symbol may already have been marked to
 			 * be ignored by another relocation referencing
 			 * the same symbol or if this object file has
 			 * already been processed by an earlier link
 			 * invocation.
 			 */
-#ifndef illumos
+			if (rsym.st_shndx != SHN_ABS) {
-#define SHN_SUNW_IGNORE	SHN_ABS
+				rsym.st_shndx = SHN_ABS;
 #endif
 			if (rsym.st_shndx != SHN_SUNW_IGNORE) {
 				rsym.st_shndx = SHN_SUNW_IGNORE;
 				(void) gelf_update_sym(data_sym, ndx, &rsym);
+			}
+		}
+	}
 	if (mod && elf_update(elf, ELF_C_WRITE) == -1)
 		goto err;
 	(void) elf_end(elf);
 	(void) close(fd);
 	while ((pair = bufs) != NULL) {
 		bufs = pair->dlp_next;