diff options
author | rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-03 19:42:41 +0000 |
---|---|---|
committer | rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-03 19:42:41 +0000 |
commit | 586b062a322b21649489e7a5d39e5441f8064f25 (patch) | |
tree | 07b71861c214726459362567c902e08753171a5b /gcc/libgcc-std.ver | |
parent | fdbb505aea5c2eea599afbee5ef7ed75295349e9 (diff) | |
download | gcc-586b062a322b21649489e7a5d39e5441f8064f25.tar.gz |
Fix conflict with another recent patch.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137432 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/libgcc-std.ver')
-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 b19871d1b0b..2df39f63e37 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 |