diff options
| author | Roland McGrath <roland@gnu.org> | 2006-04-27 01:25:47 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2006-04-27 01:25:47 +0000 |
| commit | 16a1d952b632a35513a88ba3d97a7ab9a291060b (patch) | |
| tree | 6359f088980792996502b55f95cfaf6a16d26325 /nptl | |
| parent | 02838201ee32cc7b542a8843c911877ae24fdf63 (diff) | |
* Makeconfig (%.v.i rule): Don't use -DASSEMBLER.
The predefined __ASSEMBLER__ is sufficient.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 4 | ||||
| -rw-r--r-- | nptl/sysdeps/x86_64/tls.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 25d8d8dae5..c725b8d243 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,7 @@ +2006-04-26 Roland McGrath <roland@redhat.com> + + * sysdeps/x86_64/tls.h: Include <asm/prctl.h> inside [! __ASSEMBLER__]. + 2006-04-08 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/i386/lowlevellock.h: Remove branch predicion diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h index 13cf6fb3f5..65ff0639b6 100644 --- a/nptl/sysdeps/x86_64/tls.h +++ b/nptl/sysdeps/x86_64/tls.h @@ -1,5 +1,5 @@ /* Definition for thread-local data handling. nptl/x86_64 version. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -20,8 +20,8 @@ #ifndef _TLS_H #define _TLS_H 1 -#include <asm/prctl.h> /* For ARCH_SET_FS. */ #ifndef __ASSEMBLER__ +# include <asm/prctl.h> /* For ARCH_SET_FS. */ # include <stdbool.h> # include <stddef.h> # include <stdint.h> |