From: Richard Sandiford Date: Thu, 3 Jul 2008 19:42:41 +0000 (+0000) Subject: Fix conflict with another recent patch. X-Git-Tag: releases/gcc-4.4.0~4001 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8fff079189688a014f9db20afaabb90a3d7d1a6;p=thirdparty%2Fgcc.git Fix conflict with another recent patch. From-SVN: r137432 --- diff --git a/gcc/libgcc-std.ver b/gcc/libgcc-std.ver index b19871d1b0b4..2df39f63e373 100644 --- a/gcc/libgcc-std.ver +++ b/gcc/libgcc-std.ver @@ -1801,10 +1801,6 @@ GCC_4.3.0 { __satfractunstiuta } -%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