From 2bcba94ba40f6ed885bbf03d54fb8eab24213e1a Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Tue, 30 Mar 2010 13:35:08 +0100
Subject: [PATCH] re PR other/25232 (libgcc-std.ver should include __unordxf2
 and __unordtf2)

	PR other/25232
	* libgcc-std.ver (GCC_4.5.0): Define version.  Include __unordxf2
	and __unordtf2.
	* config/bfin/libgcc-bfin.ver (GCC_4.5.0): Define version.
	Include ___unordxf2 and ___unordtf2.
	* config/i386/libgcc-glibc.ver: Do not define inheritance from
	GCC_4.4.0 here.

From-SVN: r157819
---
 gcc/ChangeLog                    | 10 ++++++++++
 gcc/config/bfin/libgcc-bfin.ver  |  6 ++++++
 gcc/config/i386/libgcc-glibc.ver |  5 +----
 gcc/libgcc-std.ver               |  8 +++++++-
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 95b9b01c6974..7d6b80a66f7b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-30  Joseph Myers  <joseph@codesourcery.com>
+
+	PR other/25232
+	* libgcc-std.ver (GCC_4.5.0): Define version.  Include __unordxf2
+	and __unordtf2.
+	* config/bfin/libgcc-bfin.ver (GCC_4.5.0): Define version.
+	Include ___unordxf2 and ___unordtf2.
+	* config/i386/libgcc-glibc.ver: Do not define inheritance from
+	GCC_4.4.0 here.
+
 2010-03-30  Tarik Graba  <tarik.graba@telecom-paristech.fr>
 
 	* config/lm32/t-lm32: New file.
diff --git a/gcc/config/bfin/libgcc-bfin.ver b/gcc/config/bfin/libgcc-bfin.ver
index 2ed3a317b519..516d91f6584b 100644
--- a/gcc/config/bfin/libgcc-bfin.ver
+++ b/gcc/config/bfin/libgcc-bfin.ver
@@ -1906,3 +1906,9 @@ GCC_4.4.0 {
 
   ___sync_synchronize
 }
+
+%inherit GCC_4.5.0 GCC_4.4.0
+GCC_4.5.0 {
+  ___unordxf2
+  ___unordtf2
+}
diff --git a/gcc/config/i386/libgcc-glibc.ver b/gcc/config/i386/libgcc-glibc.ver
index 2a2ddcd1df84..e79d3267f6f5 100644
--- a/gcc/config/i386/libgcc-glibc.ver
+++ b/gcc/config/i386/libgcc-glibc.ver
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
@@ -180,9 +180,6 @@ GCC_4.4.0 {
   __trunctfxf2
   __unordtf2
 }
-# It is OK to have a duplicate of %inherit in libgcc-std.ver since
-# mkmap-symver.awk always takes the last %inherit statement.
-%inherit GCC_4.5.0 GCC_4.4.0
 GCC_4.5.0 {
   __extendxftf2
 }
diff --git a/gcc/libgcc-std.ver b/gcc/libgcc-std.ver
index 11f0d85a19cc..5aaff5e8894a 100644
--- a/gcc/libgcc-std.ver
+++ b/gcc/libgcc-std.ver
@@ -1,5 +1,5 @@
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-# 2008 Free Software Foundation, Inc.
+# 2008, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
@@ -1904,3 +1904,9 @@ GCC_4.4.0 {
 
   __sync_synchronize
 }
+
+%inherit GCC_4.5.0 GCC_4.4.0
+GCC_4.5.0 {
+  __unordxf2
+  __unordtf2
+}