aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorH.J. Lu <hongjiu.lu@intel.com>2010-09-07 21:14:41 +0000
committerH.J. Lu <hjl@gcc.gnu.org>2010-09-07 14:14:41 -0700
commit4e75177267c0e5f3e6098ea388953bd6d9a4cef6 (patch)
tree7f60e03d6c1c47fbfc88d204431f39403c22bc56 /gcc
parent274eec6c00df9b16bfa254cb230e6c35145106a9 (diff)
downloadgcc-4e75177267c0e5f3e6098ea388953bd6d9a4cef6.zip
gcc-4e75177267c0e5f3e6098ea388953bd6d9a4cef6.tar.gz
gcc-4e75177267c0e5f3e6098ea388953bd6d9a4cef6.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/unwind-dw2-fde-glibc.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6dbb436..9acad65 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
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.
* config/t-android: Removed.
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