← Back to branch summary

~ubuntu-branches/ubuntu/utopic/eglibc/utopic

« back to all changes in this revision

Viewing changes to linuxthreads/sysdeps/x86_64/tls.h

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2012-10-26 05:14:58 UTC
  • mfrom: (1.5.1) (4.4.22 experimental)
  • Revision ID: package-import@ubuntu.com-20121026051458-oryotr4i03ob5pab
Tags: 2.16-0ubuntu1
* Merge with unreleased 2.16 in Debian experimental, remaining changes:
  - Drop the Breaks line from libc6, which refers to a Debian transition
  - Remove the libc6 recommends on libc6-i686, which we don't build
  - Enable libc6{,-dev}-armel on armhf and libc6{-dev}-armhf on armel
  - Ship update-locale and validlocale in /usr/sbin in libc-bin
  - Don't build locales or locales-all in Ubuntu, we rely on langpacks
  - Heavily mangle the way we do service restarting on major upgrades
  - Use different MIN_KERNEL_SUPPORTED versions than Debian, due to
    buildd needs.  This should be universally bumped to 3.2.0 once all
    our buildds (including the PPA guests) are running precise kernels
  - Build i386 variants as -march=i686, build amd64 with -O3, and build
    ppc64 variants (both 64-bit and 32-bit) with -O3 -fno-tree-vectorize
  - Re-enable unsubmitted-ldconfig-cache-abi.diff and rebuild the cache
    on upgrades from previous versions that used a different constant
  - debian/patches/any/local-CVE-2012-3406.diff: switch to malloc when
    array grows too large to handle via alloca extension (CVE-2012-3406)
  - Build generic i386/i686 flavour with -mno-tls-direct-seg-refs
* Changes added/dropped with this merge while reducing our delta:
  - Stop building glibc docs from the eglibc source, and instead make
    the glibc-docs stub have a hard dependency on glibc-doc-reference
  - Remove outdated conflicts against ancient versions of ia32-libs
  - Drop the tzdata dependency from libc6, it's in required and minimal
  - Use gcc-4.7/g++-4.7 by default on all our supported architectures
  - Save our historical changelog as changelog.ubuntu in the source
  - Drop nscd's libaudit build-dep for now, as libaudit is in universe
  - Drop the unnecessary Breaks from libc6 to locales and locales-all
  - Ship xen's ld.so.conf.d snippet as /etc/ld.so.conf.d/libc6-xen.conf
* Disable hard failures on the test suite for the first upload to raring

Show diffs side-by-side

added added

removed removed

Lines of Context:
linuxthreads/sysdeps/x86_64/tls.h
49
49
  uintptr_t sysinfo;
50
50
  uintptr_t stack_guard;
51
51
  uintptr_t pointer_guard;
 
52
# ifdef __FreeBSD_kernel__
 
53
  long gscope_flag;
 
54
# else
 
55
  int gscope_flag;
 
56
# endif
52
57
} tcbhead_t;
53
58
 
54
59
#else /* __ASSEMBLER__ */
147
152
  ((descr)->p_header.data.pointer_guard                               \
148
153
   = THREAD_GETMEM (THREAD_SELF, p_header.data.pointer_guard))
149
154
 
 
155
/* Get and set the global scope generation counter in the TCB head.  */
 
156
#define THREAD_GSCOPE_FLAG_UNUSED 0
 
157
#define THREAD_GSCOPE_FLAG_USED   1
 
158
#define THREAD_GSCOPE_FLAG_WAIT   2
 
159
#ifdef __FreeBSD_kernel__
 
160
# define THREAD_GSCOPE_RESET_FLAG() \
 
161
  do                                                                                \
 
162
    { int __res;                                                                    \
 
163
      asm volatile ("xchgl %0, %%fs:%P1"                                            \
 
164
                    : "=r" (__res)                                                  \
 
165
                    : "i" (offsetof (struct _pthread_descr_struct, p_gscope_flag)), \
 
166
                      "0" (THREAD_GSCOPE_FLAG_UNUSED));                             \
 
167
      if (__res == THREAD_GSCOPE_FLAG_WAIT)                                         \
 
168
        lll_futex_wake (&THREAD_SELF->p_gscope_flag, 1);                            \
 
169
    }                                                                               \
 
170
  while (0)
 
171
#else
 
172
/* As the FreeBSD kernel defines futex as long (compared to int with
 
173
   a Linux kernel), we need to use xchgq instead of xchgl to handle
 
174
   the gscope_flag variable. */
 
175
# define THREAD_GSCOPE_RESET_FLAG() \
 
176
  do                                                                                \
 
177
    { long __res;                                                                   \
 
178
      asm volatile ("xchgq %0, %%fs:%P1"                                            \
 
179
                    : "=r" (__res)                                                  \
 
180
                    : "i" (offsetof (struct _pthread_descr_struct, p_gscope_flag)), \
 
181
                      "0" (THREAD_GSCOPE_FLAG_UNUSED));                             \
 
182
      if (__res == THREAD_GSCOPE_FLAG_WAIT)                                         \
 
183
        lll_futex_wake (&THREAD_SELF->p_gscope_flag, 1);                            \
 
184
    }                                                                               \
 
185
  while (0)
 
186
#endif          /* __FreeBSD_kernel__ */
 
187
#define THREAD_GSCOPE_SET_FLAG() \
 
188
  THREAD_SETMEM (THREAD_SELF, p_gscope_flag, THREAD_GSCOPE_FLAG_USED)
 
189
#define THREAD_GSCOPE_WAIT() \
 
190
  do { /* GL(dl_wait_lookup_done) () */ } while (0)
 
191
 
150
192
# endif /* HAVE_TLS_SUPPORT */
151
193
#endif /* __ASSEMBLER__ */
152
194