diff options
| author | gerald <gerald@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-10-05 23:35:55 +0000 |
|---|---|---|
| committer | gerald <gerald@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-10-05 23:35:55 +0000 |
| commit | 81ae3d37d60549631e256682e39751be1b0b7464 (patch) | |
| tree | 240ae56afd2e9fe2d09086d087498ae315bf31a4 /libgcc | |
| parent | 6ffb3ddf1cfffe734820b2adca9950d98cf419df (diff) | |
| download | gcc-81ae3d37d60549631e256682e39751be1b0b7464.tar.gz | |
* config.host (*-*-openbsd*): Add t-eh-dw2-dip to tmake_file.
* unwind-dw2-fde-dip.c: Don't include <elf.h> on OpenBSD.
(USE_PT_GNU_EH_FRAME): Define for OpenBSD.
(ElfW): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@192148 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 7 | ||||
| -rw-r--r-- | libgcc/config.host | 2 | ||||
| -rw-r--r-- | libgcc/unwind-dw2-fde-dip.c | 8 |
3 files changed, 15 insertions, 2 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 7bd8312921a..0b6f592eb2f 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,10 @@ +2012-10-06 Mark Kettenis <kettenis@openbsd.org> + + * config.host (*-*-openbsd*): Add t-eh-dw2-dip to tmake_file. + * unwind-dw2-fde-dip.c: Don't include <elf.h> on OpenBSD. + (USE_PT_GNU_EH_FRAME): Define for OpenBSD. + (ElfW): Likewise. + 2012-10-05 Jonathan Wakely <jwakely.gcc@gmail.com> PR other/53889 diff --git a/libgcc/config.host b/libgcc/config.host index 368902467fb..763f6c3a252 100644 --- a/libgcc/config.host +++ b/libgcc/config.host @@ -213,7 +213,7 @@ case ${host} in esac ;; *-*-openbsd*) - tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic" + tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip" case ${target_thread_file} in posix) tmake_file="$tmake_file t-openbsd-thread" diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c index 92f8ab54644..2ce3af80b15 100644 --- a/libgcc/unwind-dw2-fde-dip.c +++ b/libgcc/unwind-dw2-fde-dip.c @@ -33,7 +33,7 @@ #include "tconfig.h" #include "tsystem.h" -#ifndef inhibit_libc +#if !defined(inhibit_libc) && !defined(__OpenBSD__) #include <elf.h> /* Get DT_CONFIG. */ #endif #include "coretypes.h" @@ -65,6 +65,12 @@ #endif #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ + && defined(__OpenBSD__) +# define ElfW(type) Elf_##type +# define USE_PT_GNU_EH_FRAME +#endif + +#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ && defined(TARGET_DL_ITERATE_PHDR) \ && defined(__sun__) && defined(__svr4__) # define USE_PT_GNU_EH_FRAME |