Move DT_NUM from <sys/exec_elf.h> to resolv.h in ld.so where it belongs.

ok guenther@

diff --git a/libexec/ld.so/resolve.h b/libexec/ld.so/resolve.h
index 24dbef6..2e35fc8 100644 (file)
--- a/libexec/ld.so/resolve.h
+++ b/libexec/ld.so/resolve.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: resolve.h,v 1.80 2016/08/23 06:46:17 kettenis Exp $ */
+/*     $OpenBSD: resolve.h,v 1.81 2016/08/30 12:47:19 kettenis Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -33,6 +33,9 @@
 #include <link.h>
 #include <dlfcn.h>
 
+/* Number of low tags that are used saved internally (0 .. DT_NUM-1) */
+#define DT_NUM (DT_PREINIT_ARRAYSZ + 1)
+
 struct load_list {
        struct load_list *next;
        void            *start;

diff --git a/sys/sys/exec_elf.h b/sys/sys/exec_elf.h
index f3186e6..baf6f92 100644 (file)
--- a/sys/sys/exec_elf.h
+++ b/sys/sys/exec_elf.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: exec_elf.h,v 1.60 2016/08/23 06:46:17 kettenis Exp $  */
+/*     $OpenBSD: exec_elf.h,v 1.61 2016/08/30 12:47:19 kettenis Exp $  */
 /*
  * Copyright (c) 1995, 1996 Erik Theisen.  All rights reserved.
  *
@@ -525,9 +525,6 @@ typedef struct {
 #define DF_1_NODUMP    0x00001000
 #define DF_1_CONLFAT   0x00002000
 
-/* ld.so: number of low tags that are used saved internally (0 .. DT_NUM-1) */
-#define DT_NUM         (DT_PREINIT_ARRAYSZ+1)
-
 /* Standard ELF hashing function */
 unsigned int elf_hash(const unsigned char *name);