diff options
author | Ulrich Drepper <drepper@gmail.com> | 2011-09-05 12:46:12 -0400 |
---|---|---|
committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-05 12:46:12 -0400 |
commit | 3b142ce5728f6d683f3375fb33099ebf243f6681 (patch) | |
tree | 896f73d70426cd798e72bd786c0cb000d55b50ad /scripts/data/localplt-sparc-linux-gnu.data | |
parent | 2f0ad8f3a470fa5e9aeb9c5a41984f96ae58d7ba (diff) | |
parent | 5f4318d102d604e2f80bc97927e2d80f76063639 (diff) | |
download | glibc-3b142ce5728f6d683f3375fb33099ebf243f6681.tar.gz glibc-3b142ce5728f6d683f3375fb33099ebf243f6681.tar.xz glibc-3b142ce5728f6d683f3375fb33099ebf243f6681.zip |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'scripts/data/localplt-sparc-linux-gnu.data')
-rw-r--r-- | scripts/data/localplt-sparc-linux-gnu.data | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/data/localplt-sparc-linux-gnu.data b/scripts/data/localplt-sparc-linux-gnu.data index 5ceed16c9b..534fb3d9b4 100644 --- a/scripts/data/localplt-sparc-linux-gnu.data +++ b/scripts/data/localplt-sparc-linux-gnu.data @@ -10,7 +10,6 @@ libc.so: _Q_mul libc.so: _Q_sub libc.so: _Unwind_Find_FDE libc.so: calloc -libc.so: ffs libc.so: free libc.so: malloc libc.so: memalign |