diff options
| author | Richard Sandiford <rsandifo@gcc.gnu.org> | 2008-07-03 19:42:41 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2008-07-03 19:42:41 +0000 |
| commit | b8fff079189688a014f9db20afaabb90a3d7d1a6 (patch) | |
| tree | 07b71861c214726459362567c902e08753171a5b /gcc | |
| parent | f92518d7ae62839a8f41fbccf72a9cdc3241f6ae (diff) | |
| download | gcc-b8fff079189688a014f9db20afaabb90a3d7d1a6.zip gcc-b8fff079189688a014f9db20afaabb90a3d7d1a6.tar.gz gcc-b8fff079189688a014f9db20afaabb90a3d7d1a6.tar.bz2 | |
Fix conflict with another recent patch.
From-SVN: r137432
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/libgcc-std.ver | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/gcc/libgcc-std.ver b/gcc/libgcc-std.ver index b19871d..2df39f6 100644 --- 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 |