From 16a1d952b632a35513a88ba3d97a7ab9a291060b Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 27 Apr 2006 01:25:47 +0000 Subject: [PATCH] * Makeconfig (%.v.i rule): Don't use -DASSEMBLER. The predefined __ASSEMBLER__ is sufficient. --- ChangeLog | 5 +++++ nptl/ChangeLog | 4 ++++ nptl/sysdeps/x86_64/tls.h | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3e7d0c..ec78786 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-04-26 Roland McGrath + + * Makeconfig (%.v.i rule): Don't use -DASSEMBLER. + The predefined __ASSEMBLER__ is sufficient. + 2006-04-26 Ulrich Drepper * sysdeps/unix/sysv/linux/syscalls.list: Add vmsplice. diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 25d8d8d..c725b8d 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,7 @@ +2006-04-26 Roland McGrath + + * sysdeps/x86_64/tls.h: Include inside [! __ASSEMBLER__]. + 2006-04-08 Ulrich Drepper * 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 13cf6fb..65ff063 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 /* For ARCH_SET_FS. */ #ifndef __ASSEMBLER__ +# include /* For ARCH_SET_FS. */ # include # include # include -- 2.7.4