From 4e75177267c0e5f3e6098ea388953bd6d9a4cef6 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hongjiu.lu@intel.com>
Date: Tue, 7 Sep 2010 21:14:41 +0000
Subject: [PATCH] Include <link.h> only if USE_PT_GNU_EH_FRAME is defined.

2010-09-07  H.J. Lu  <hongjiu.lu@intel.com>

	* unwind-dw2-fde-glibc.c: Include <elf.h> for DT_CONFIG.
	Include <link.h> only if USE_PT_GNU_EH_FRAME is defined.

From-SVN: r163970
---
 gcc/ChangeLog              | 5 +++++
 gcc/unwind-dw2-fde-glibc.c | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6dbb4369e780..9acad65636e9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* unwind-dw2-fde-glibc.c: Include <elf.h> for DT_CONFIG.
+	Include <link.h> only if USE_PT_GNU_EH_FRAME is defined.
+
 2010-09-07  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config.gcc: Don't append t-android for Android targets.
diff --git a/gcc/unwind-dw2-fde-glibc.c b/gcc/unwind-dw2-fde-glibc.c
index b8a7312f5011..a762d875c9ed 100644
--- a/gcc/unwind-dw2-fde-glibc.c
+++ b/gcc/unwind-dw2-fde-glibc.c
@@ -33,7 +33,7 @@
 #include "tconfig.h"
 #include "tsystem.h"
 #ifndef inhibit_libc
-#include <link.h>
+#include <elf.h>		/* Get DT_CONFIG.  */
 #endif
 #include "coretypes.h"
 #include "tm.h"
@@ -59,6 +59,8 @@
 
 #if defined(USE_PT_GNU_EH_FRAME)
 
+#include <link.h>
+
 #ifndef __RELOC_POINTER
 # define __RELOC_POINTER(ptr, base) ((ptr) + (base))
 #endif