← Back to branch summary

~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to sysdeps/i386/i686/strtok.S

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
https://launchpad.net/bugs/1085342
https://launchpad.net/bugs/613662
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sysdeps/i386/i686/strtok.S
1
1
/* strtok (str, delim) -- Return next DELIM separated token from STR.
2
2
   For Intel 80686.
3
 
   Copyright (C) 1998, 2000, 2001, 2005, 2006 Free Software Foundation, Inc.
 
3
   Copyright (C) 1998-2012 Free Software Foundation, Inc.
4
4
   This file is part of the GNU C Library.
5
5
   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
6
6
 
43
43
#else
44
44
        .bss
45
45
        .local save_ptr
46
 
        ASM_TYPE_DIRECTIVE (save_ptr, @object)
 
46
        .type save_ptr, @object
47
47
        .size save_ptr, 4
48
48
save_ptr:
49
49
# if __BOUNDED_POINTERS__