merge from gcc

diff --git a/include/xtensa-config.h b/include/xtensa-config.h
index bc998156b1e61c73e164a47b0397e711a8c7e1a5..05ca5e5c429955cd7287f539aedc28f22532dc38 100644 (file)
--- a/include/xtensa-config.h
+++ b/include/xtensa-config.h
@@ -1,7 +1,7 @@
 /* Xtensa configuration settings.
    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
    Free Software Foundation, Inc.
-   Contributed by Bob Wilson (bwilson@tensilica.com) at Tensilica.
+   Contributed by Bob Wilson (bob.wilson@acm.org) at Tensilica.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -46,6 +46,9 @@
 #undef XSHAL_USE_ABSOLUTE_LITERALS
 #define XSHAL_USE_ABSOLUTE_LITERALS    0
 
+#undef XSHAL_HAVE_TEXT_SECTION_LITERALS
+#define XSHAL_HAVE_TEXT_SECTION_LITERALS 1 /* Set if there is some memory that allows both code and literals.  */
+
 #undef XCHAL_HAVE_MAC16
 #define XCHAL_HAVE_MAC16               0
 
@@ -100,6 +103,8 @@
 #undef XCHAL_HAVE_FP_RSQRT
 #define XCHAL_HAVE_FP_RSQRT            0
 
+#undef XCHAL_HAVE_DFP_accel
+#define XCHAL_HAVE_DFP_accel                   0
 #undef XCHAL_HAVE_WINDOWED
 #define XCHAL_HAVE_WINDOWED            1
 

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 4414e04792f7d89f5a0eafda1dbf47983b4e528d..520d5dc4a7be1f835ee6802f97cda8c77164a623 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2ß1ß-05-26  Kai Tietz  <kai.tietz@onevision.com>
+
+       * testsuite/demangle-expected: Add tests for __int128
+       and unsigned __int128 types.
+
 2010-05-06  Magnus Fromreide  <magfr@lysator.liu.se>
            Jason Merrill  <jason@redhat.com>
 

diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected
index a3331c45ee8374192bd8e59b738fd0f9cd49841f..ef84bc113a84e7c3491554339887949e1559b7c0 100644 (file)
--- a/libiberty/testsuite/demangle-expected
+++ b/libiberty/testsuite/demangle-expected
@@ -3220,6 +3220,16 @@ _26_GLOBAL_$N$_tmp_n.iilg4Gya$app_instance
 {anonymous}::app_instance
 {anonymous}::app_instance
 #
+--format=gnu-v3 --no-params
+_Z3fo5n
+fo5(__int128)
+fo5
+#
+--format=gnu-v3 --no-params
+_Z3fo5o
+fo5(unsigned __int128)
+fo5
+#
 --format=java
 _ZN4java3awt10ScrollPane7addImplEPNS0_9ComponentEPNS_4lang6ObjectEi
 java.awt.ScrollPane.addImpl(java.awt.Component, java.lang.Object, int)