* Makeconfig (%.v.i rule): Don't use -DASSEMBLER.

	The predefined __ASSEMBLER__ is sufficient.

diff --git a/ChangeLog b/ChangeLog
index a3e7d0c4c703535af40ba3950182d79c1106c9e7..ec78786e92f35e2ea3e14d87b044dc10deb95961 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-26  Roland McGrath  <roland@redhat.com>
+
+       * Makeconfig (%.v.i rule): Don't use -DASSEMBLER.
+       The predefined __ASSEMBLER__ is sufficient.
+
 2006-04-26  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/syscalls.list: Add vmsplice.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 25d8d8dae52e0ad0c35c0bafb084285f8d16853c..c725b8d243aabdfbf9ef5dbb3d8796187a3f392f 100644 (file)
--- 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 13cf6fb3f5019d757fcc2c70ca5a9dd4fd00b4a1..65ff0639b61cc660ee288bd2551db85262e712a0 100644 (file)
--- 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>