Merge branch 'vendor/GCC47'
authorJohn Marino <draco@marino.st>
Wed, 8 May 2013 16:37:36 +0000 (18:37 +0200)
committerJohn Marino <draco@marino.st>
Wed, 8 May 2013 16:37:36 +0000 (18:37 +0200)
1  2 
contrib/gcc-4.7/gcc/config/i386/i386.c
contrib/gcc-4.7/gcc/gcc.c
contrib/gcc-4.7/gcc/tree-inline.c
contrib/gcc-4.7/libgcc/unwind-dw2-fde-dip.c

Simple merge
Simple merge
  #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(__OpenBSD__) || defined(__NetBSD__))
 +# define ElfW(n) Elf_##n
 +# 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
  #endif