From patchwork Tue Sep  7 16:38:38 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: PATCH: Include <link.h> only if USE_PT_GNU_EH_FRAME is defined
Date: Tue, 07 Sep 2010 06:38:38 -0000
From: "H.J. Lu" <hongjiu.lu@intel.com>
X-Patchwork-Id: 64035
Message-Id: <20100907163838.GA13615@intel.com>
To: gcc-patches@gcc.gnu.org
Cc: Maxim Kuvyrkov <maxim@codesourcery.com>

Hi,

Bionic C library doesn't have <link.h>.  But it uses
unwind-dw2-fde-glibc.c.  This patch includes <link.h> only if it is
really needed.  OK for trunk?

Thanks.


H.J.

---
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.

diff --git a/gcc/unwind-dw2-fde-glibc.c b/gcc/unwind-dw2-fde-glibc.c
index b8a7312..a762d87 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