> Date: Mon, 22 Aug 2016 21:27:51 -0700
> From: Philip Guenther <guent...@gmail.com>
> 
> Right now, DT_NUM is defined in <sys/exec_elf.h>, but that's dumb: it 
> should be moved immediately to libexec/ld.so/resolv.h, right above this 
> struct, and its value increased to match the growth here.  I killed it's 
> use in lib/csu for this, so don't hesitate in pulling it over.

Currntly doing a make build on hppa with this diff.

ok (assuming it's happy)?


Index: sys/sys/exec_elf.h
===================================================================
RCS file: /cvs/src/sys/sys/exec_elf.h,v
retrieving revision 1.60
diff -u -p -r1.60 exec_elf.h
--- sys/sys/exec_elf.h  23 Aug 2016 06:46:17 -0000      1.60
+++ sys/sys/exec_elf.h  23 Aug 2016 13:56:37 -0000
@@ -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);
 
Index: libexec/ld.so/resolve.h
===================================================================
RCS file: /cvs/src/libexec/ld.so/resolve.h,v
retrieving revision 1.80
diff -u -p -r1.80 resolve.h
--- libexec/ld.so/resolve.h     23 Aug 2016 06:46:17 -0000      1.80
+++ libexec/ld.so/resolve.h     23 Aug 2016 13:56:37 -0000
@@ -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;

Reply via email to