Fix conflict with another recent patch.

From-SVN: r137432

Fix conflict with another recent patch.
From-SVN: r137432
b8fff079 · Richard Sandiford · f92518d7 · b8fff079
Commit b8fff079 authored 16 years ago by Richard Sandiford
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

gcc/libgcc-std.ver
+0 -4

No files found.
--- a/gcc/libgcc-std.ver
+++ b/gcc/libgcc-std.ver
@@ -1803,10 +1803,6 @@ GCC_4.3.0 {

 %inherit GCC_4.4.0 GCC_4.3.0
 GCC_4.4.0 {
-}
-
-%inherit GCC_4.4.0 GCC_4.3.0
-GCC_4.4.0 {
  __sync_fetch_and_add_1
  __sync_fetch_and_sub_1
  __sync_fetch_and_or_1