This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

[PATCH] Fix glibc Makefile issues

From: Jakub Jelinek <jakub at redhat dot com>
To: Ulrich Drepper <drepper at redhat dot com>, Roland McGrath <roland at redhat dot com>
Cc: Glibc hackers <libc-hacker at sources dot redhat dot com>
Date: Tue, 31 Dec 2002 18:52:46 +0100
Subject: [PATCH] Fix glibc Makefile issues
References: <20021231170752.D1310@sunsite.ms.mff.cuni.cz> <20021231175253.E1310@sunsite.ms.mff.cuni.cz>
Reply-to: Jakub Jelinek <jakub at redhat dot com>

On Tue, Dec 31, 2002 at 05:52:53PM +0100, Jakub Jelinek wrote:
> Seems like the s-proto-cancel.d changes are the culprit:
> 
> ...
> Prerequisite `/usr/include/bits/stdio_lim.h' is older than target `/usr/src/redhat/BUILD/glibc-2.3.1-20021231/build-x86_64-linux/s-proto-cancel.d'.
> 
> Depending on what exact order s-proto-cancel.d 
> vs. bits/stdio_lim.h are generated it contains either
> $(common-objpfx)bits/stdio_lim.h
> or
> /usr/include/bits/stdio_lim.h

Seems like ASSEMBLER was not defined when generating the dependencies.
Most of the headers use __ASSEMBLER__ anyway, so I've switched to that.

2002-12-31  Jakub Jelinek  <jakub@redhat.com>

linuxthreads/
	* sysdeps/i386/i686/pt-machine.h: Use __ASSEMBLER__ instead of
	ASSEMBLER test macro.
	* sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Likewise.
	* sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h: Likewise.
	* sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h: Likewise.
nptl/
	* sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Use __ASSEMBLER__
	instead of ASSEMBLER test macro.

--- libc/linuxthreads/sysdeps/i386/i686/pt-machine.h.jj	2002-08-28 07:49:55.000000000 +0200
+++ libc/linuxthreads/sysdeps/i386/i686/pt-machine.h	2002-12-31 20:14:06.000000000 +0100
@@ -27,7 +27,7 @@
 #endif
 #include "kernel-features.h"
 
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 extern long int testandset (int *spinlock);
 extern int __compare_and_swap (long int *p, long int oldval, long int newval);
 
--- libc/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h.jj	2002-12-31 10:12:51.000000000 +0100
+++ libc/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h	2002-12-31 20:13:01.000000000 +0100
@@ -20,7 +20,7 @@
 #include <sysdep.h>
 #include <tls.h>
 #include <pt-machine.h>
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 # include <linuxthreads/internals.h>
 #endif
 
@@ -83,7 +83,7 @@
 # define __local_multiple_threads __pthread_multiple_threads
 #endif
 
-# ifndef ASSEMBLER
+# ifndef __ASSEMBLER__
 #  if defined FLOATING_STACKS && USE___THREAD && defined PIC
 #   define SINGLE_THREAD_P \
   __builtin_expect (THREAD_GETMEM (THREAD_SELF,				      \
@@ -112,7 +112,7 @@ extern int __local_multiple_threads attr
 #  endif
 # endif
 
-#elif !defined ASSEMBLER
+#elif !defined __ASSEMBLER__
 
 /* This code should never be used but we define it anyhow.  */
 # define SINGLE_THREAD_P (1)
--- libc/linuxthreads/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h.jj	2002-12-31 10:12:51.000000000 +0100
+++ libc/linuxthreads/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h	2002-12-31 20:13:01.000000000 +0100
@@ -19,7 +19,7 @@
 
 #include <sysdep.h>
 #include <tls.h>
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 # include <linuxthreads/internals.h>
 #endif
 
@@ -99,7 +99,7 @@ __syscall_error_##args:							      \
 #define COPY_ARGS_6	COPY_ARGS_5 mov out5 = in5;
 #define COPY_ARGS_7	COPY_ARGS_6 mov out6 = in6;
 
-# ifndef ASSEMBLER
+# ifndef __ASSEMBLER__
 #  define SINGLE_THREAD_P \
   __builtin_expect (THREAD_GETMEM (THREAD_SELF,				      \
 				   p_header.data.multiple_threads) == 0, 1)
@@ -108,7 +108,7 @@ __syscall_error_##args:							      \
   adds r14 = MULTIPLE_THREADS_OFFSET, r13 ;; ld4 r14 = [r14] ;; cmp4.ne p6, p7 = 0, r14 ;;
 # endif
 
-#elif !defined ASSEMBLER
+#elif !defined __ASSEMBLER__
 
 /* This code should never be used but we define it anyhow.  */
 # define SINGLE_THREAD_P (1)
--- libc/linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h.jj	2002-12-28 11:55:45.000000000 +0100
+++ libc/linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h	2002-12-31 20:13:01.000000000 +0100
@@ -18,7 +18,7 @@
    02111-1307 USA.  */
 
 #include <sysdep.h>
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 # include <linuxthreads/internals.h>
 #endif
 
@@ -90,7 +90,7 @@
 #  define __local_multiple_threads __pthread_multiple_threads
 # endif
 
-# ifndef ASSEMBLER
+# ifndef __ASSEMBLER__
 extern int __local_multiple_threads attribute_hidden;
 #  define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
 # else
@@ -107,7 +107,7 @@ extern int __local_multiple_threads attr
 #  endif
 # endif
 
-#elif !defined ASSEMBLER
+#elif !defined __ASSEMBLER__
 
 /* This code should never be used but we define it anyhow.  */
 # define SINGLE_THREAD_P (1)
--- libc/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h.jj	2002-12-31 10:12:52.000000000 +0100
+++ libc/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h	2002-12-31 20:13:01.000000000 +0100
@@ -19,7 +19,7 @@
 
 #include <sysdep.h>
 #include <tls.h>
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 # include <linuxthreads/internals.h>
 #endif
 
@@ -81,7 +81,7 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_er
 #define COPY_ARGS_5	COPY_ARGS_4 mov %i4, %o4;
 #define COPY_ARGS_6	COPY_ARGS_5 mov %i5, %o5;
 
-# ifndef ASSEMBLER
+# ifndef __ASSEMBLER__
 #  define SINGLE_THREAD_P \
   __builtin_expect (THREAD_GETMEM (THREAD_SELF,				      \
 				   p_header.data.multiple_threads) == 0, 1)
@@ -89,7 +89,7 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_er
 #  define SINGLE_THREAD_P ld [%g6 + MULTIPLE_THREADS_OFFSET], %g1
 # endif
 
-#elif !defined ASSEMBLER
+#elif !defined __ASSEMBLER__
 
 /* This code should never be used but we define it anyhow.  */
 # define SINGLE_THREAD_P (1)
--- libc/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h.jj	2002-12-31 10:12:52.000000000 +0100
+++ libc/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h	2002-12-31 20:13:01.000000000 +0100
@@ -19,7 +19,7 @@
 
 #include <sysdep.h>
 #include <tls.h>
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 # include <linuxthreads/internals.h>
 #endif
 
@@ -80,7 +80,7 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_er
 #define COPY_ARGS_5	COPY_ARGS_4 mov %i4, %o4;
 #define COPY_ARGS_6	COPY_ARGS_5 mov %i5, %o5;
 
-# ifndef ASSEMBLER
+# ifndef __ASSEMBLER__
 #  define SINGLE_THREAD_P \
   __builtin_expect (THREAD_GETMEM (THREAD_SELF,				      \
 				   p_header.data.multiple_threads) == 0, 1)
@@ -88,7 +88,7 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_er
 #  define SINGLE_THREAD_P ld [%g6 + MULTIPLE_THREADS_OFFSET], %g1
 # endif
 
-#elif !defined ASSEMBLER
+#elif !defined __ASSEMBLER__
 
 /* This code should never be used but we define it anyhow.  */
 # define SINGLE_THREAD_P (1)
--- libc/linuxthreads/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h.jj	2002-12-18 13:43:50.000000000 +0100
+++ libc/linuxthreads/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h	2002-12-31 20:13:01.000000000 +0100
@@ -20,7 +20,7 @@
 #include <sysdep.h>
 #include <tls.h>
 #include <pt-machine.h>
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 # include <linuxthreads/internals.h>
 #endif
 
@@ -102,7 +102,7 @@
 #  define __local_multiple_threads __libc_multiple_threads
 # endif
 
-# ifndef ASSEMBLER
+# ifndef __ASSEMBLER__
 extern int __local_multiple_threads attribute_hidden;
 #   define SINGLE_THREAD_P \
   __builtin_expect (__local_multiple_threads == 0, 1)
@@ -110,7 +110,7 @@ extern int __local_multiple_threads attr
 #  define SINGLE_THREAD_P cmpl $0, __local_multiple_threads(%rip)
 # endif
 
-#elif !defined ASSEMBLER
+#elif !defined __ASSEMBLER__
 
 /* This code should never be used but we define it anyhow.  */
 # define SINGLE_THREAD_P (1)
--- libc/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h.jj	2002-12-18 13:44:36.000000000 +0100
+++ libc/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h	2002-12-31 20:13:01.000000000 +0100
@@ -19,7 +19,7 @@
 
 #include <sysdep.h>
 #include <tls.h>
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 # include <nptl/pthreadP.h>
 #endif
 
@@ -76,7 +76,7 @@
 # define POPCARGS_4	POPCARGS_2
 # define POPCARGS_5	POPCARGS_2
 
-# ifndef ASSEMBLER
+# ifndef __ASSEMBLER__
 #  define SINGLE_THREAD_P \
   __builtin_expect (THREAD_GETMEM (THREAD_SELF,				      \
 				   header.data.multiple_threads) == 0, 1)
@@ -84,7 +84,7 @@
 #  define SINGLE_THREAD_P cmpl $0, %gs:MULTIPLE_THREADS_OFFSET
 # endif
 
-#elif !defined ASSEMBLER
+#elif !defined __ASSEMBLER__
 
 /* This code should never be used but we define it anyhow.  */
 # define SINGLE_THREAD_P (1)


	Jakub

Follow-Ups:
- Re: [PATCH] Fix glibc Makefile issues
  - From: Roland McGrath

References:
- glibc Makefile issues
  - From: Jakub Jelinek
- Re: glibc Makefile issues
  - From: Jakub Jelinek

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]