summaryrefslogtreecommitdiff
path: root/libgcc
diff options
context:
space:
mode:
Diffstat (limited to 'libgcc')
-rw-r--r--libgcc/ChangeLog8
-rw-r--r--libgcc/config.host1
-rw-r--r--libgcc/config/i386/elf-lib.h2
-rw-r--r--libgcc/unwind-dw2-fde-dip.c3
4 files changed, 10 insertions, 4 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index be24ed4c9be..08054548bc5 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-01-27 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * config.host (i[34567]86-*-solaris2*, x86_64-*-solaris2.1[0-9]*):
+ Add i386/elf-lib.h to tm_file.
+ * config/i386/elf-lib.h: Fix comment.
+ * unwind-dw2-fde-dip.c (_Unwind_IteratePhdrCallback) [__x86_64__
+ && __sun__ && __svr4__]: Remove workaround.
+
2015-01-25 Allan Sandfeld Jensen <sandfeld@kde.org>
* config/i386/cpuinfo.c (enum processor_features): Add FEATURE_BMI and
diff --git a/libgcc/config.host b/libgcc/config.host
index 92ac88eea7b..3c19b1fcfc2 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -619,6 +619,7 @@ i[34567]86-*-rtems*)
i[34567]86-*-solaris2* | x86_64-*-solaris2.1[0-9]*)
tmake_file="$tmake_file i386/t-crtpc i386/t-crtfm"
extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
+ tm_file="${tm_file} i386/elf-lib.h"
md_unwind_header=i386/sol2-unwind.h
;;
i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae)
diff --git a/libgcc/config/i386/elf-lib.h b/libgcc/config/i386/elf-lib.h
index 94fc48682bf..44111851559 100644
--- a/libgcc/config/i386/elf-lib.h
+++ b/libgcc/config/i386/elf-lib.h
@@ -1,4 +1,4 @@
-/* Definitions for Intel 386 systems using GNU userspace.
+/* Definitions for Intel 386 ELF systems.
Copyright (C) 2015 Free Software Foundation, Inc.
GCC is free software; you can redistribute it and/or modify it under
diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c
index 47af7a34a6f..e1e566b5d57 100644
--- a/libgcc/unwind-dw2-fde-dip.c
+++ b/libgcc/unwind-dw2-fde-dip.c
@@ -343,9 +343,6 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr)
}
# elif defined __FRV_FDPIC__ && defined __linux__
data->dbase = load_base.got_value;
-# elif defined __x86_64__ && defined __sun__ && defined __svr4__
- /* While CRT_GET_RFIB_DATA is also defined for 64-bit Solaris 10+/x86, it
- doesn't apply since it uses DW_EH_PE_pcrel encoding. */
# else
# error What is DW_EH_PE_datarel base on this platform?
# endif