← Back to branch summary

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

« back to all changes in this revision

Viewing changes to locale/localeinfo.h

  • 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:
locale/localeinfo.h
255
255
#define _NL_CURRENT_DEFINE(category) \
256
256
  __thread struct __locale_data *const *_nl_current_##category \
257
257
    attribute_hidden = &_nl_global_locale.__locales[category]; \
258
 
  asm (_NL_CURRENT_DEFINE_STRINGIFY (ASM_GLOBAL_DIRECTIVE) \
259
 
       " " __SYMBOL_PREFIX "_nl_current_" #category "_used\n" \
 
258
  asm (".globl " __SYMBOL_PREFIX "_nl_current_" #category "_used\n" \
260
259
       _NL_CURRENT_DEFINE_ABS (_nl_current_##category##_used, 1));
261
 
#define _NL_CURRENT_DEFINE_STRINGIFY(x) _NL_CURRENT_DEFINE_STRINGIFY_1 (x)
262
 
#define _NL_CURRENT_DEFINE_STRINGIFY_1(x) #x
263
260
#ifdef HAVE_ASM_SET_DIRECTIVE
264
261
# define _NL_CURRENT_DEFINE_ABS(sym, val) ".set " #sym ", " #val
265
262
#else