From 74ce45972d88604aa759040cfd2570674cfb439d Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Mon, 28 Oct 2013 14:59:41 -0700
Subject: [PATCH] Update <sys/exec_elf.h> to get the DF_* flags.
Change-Id: Ia9e785f6b95122f94ee3b01a312db1d5bb91a72e
---
libc/include/sys/exec_elf.h | 9 ++++++++-
linker/linker.h | 9 ---------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/libc/include/sys/exec_elf.h b/libc/include/sys/exec_elf.h
index ec54a601a..e3aa52ae2 100644
--- a/libc/include/sys/exec_elf.h
+++ b/libc/include/sys/exec_elf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.h,v 1.129 2013/09/10 16:24:02 matt Exp $ */
+/* $NetBSD: exec_elf.h,v 1.130 2013/10/28 21:36:43 matt Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -693,6 +693,13 @@ typedef struct {
#define DT_LOPROC 0x70000000 /* Processor-specific range */
#define DT_HIPROC 0x7fffffff
+/* Flag values for DT_FLAGS */
+#define DF_ORIGIN 0x00000001 /* uses $ORIGIN */
+#define DF_SYMBOLIC 0x00000002 /* */
+#define DF_TEXTREL 0x00000004 /* */
+#define DF_BIND_NOW 0x00000008 /* */
+#define DF_STATICT_LS 0x00000010 /* */
+
/* Flag values for DT_FLAGS_1 (incomplete) */
#define DF_1_BIND_NOW 0x00000001 /* Same as DF_BIND_NOW */
#define DF_1_NODELETE 0x00000008 /* Set the RTLD_NODELETE for object */
diff --git a/linker/linker.h b/linker/linker.h
index b9e12377e..647c36a8a 100644
--- a/linker/linker.h
+++ b/linker/linker.h
@@ -197,15 +197,6 @@ struct soinfo {
void CallFunction(const char* function_name, linker_function_t function);
};
-// The possible DT_FLAGS bits are in
-// http://www.sco.com/developers/gabi/latest/ch5.dynamic.html#dynamic_section
-// but not in the upstream NetBSD <sys/exec_elf.h> header file ours is based on.
-#define DF_ORIGIN 0x1
-#define DF_SYMBOLIC 0x2
-#define DF_TEXTREL 0x4
-#define DF_BIND_NOW 0x8
-#define DF_STATIC_TLS 0x10
-
extern soinfo libdl_info;
void do_android_update_LD_LIBRARY_PATH(const char* ld_library_path);