* glibc Makefile issues
@ 2002-12-31 8:08 Jakub Jelinek
2002-12-31 8:53 ` Jakub Jelinek
0 siblings, 1 reply; 4+ messages in thread
From: Jakub Jelinek @ 2002-12-31 8:08 UTC (permalink / raw)
To: Glibc hackers
Hi!
While glibc from CVS up to Sat built just fine, with today's
CVS I'm getting not completely reproduceable errors during make -jN
(not make install), like:
make[2]: Entering directory `/usr/src/build/186224-i686/BUILD/glibc-2.3.1-20021231/stdio-common'
mkdir /usr/src/build/186224-i686/BUILD/glibc-2.3.1-20021231/build-i686-linux2.4/stdio-common
/usr/bin/install: cannot remove `/usr/include/bits/stdio_lim.h': Permission denied
make[2]: *** [/usr/include/bits/stdio_lim.h] Error 1
make[2]: *** Waiting for unfinished jobs....
make[2]: *** Waiting for unfinished jobs....
make[2]: Leaving directory `/usr/src/build/186224-i686/BUILD/glibc-2.3.1-20021231/stdio-common'
make[1]: *** [stdio-common/subdir_lib] Error 2
Got this twice on i686 (once in NPTL and once in linuxthreads build), once on i386,
once on x86_64 (from 4 builds on all arches, the remaining arches built fine).
Have tried to add back
+# Convenient target to update all the generated source files.
+.PHONY: generated
+generated: $(addprefix $(common-objpfx),$(common-generated)) \
+ $(addprefix $(objpfx),$(generated))
+
to Rules (and remove generated += $(foreach s,.c .S l.c l.S f.c f.S,$(calls:s_%=m_%$s))
from math/Makefile, since then IA-64 wouldn't build), but it happened again.
Any ideas what's going on (ie. why something other than make install is
attempting to install files)?
Jakub
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: glibc Makefile issues
2002-12-31 8:08 glibc Makefile issues Jakub Jelinek
@ 2002-12-31 8:53 ` Jakub Jelinek
2002-12-31 9:53 ` [PATCH] Fix " Jakub Jelinek
0 siblings, 1 reply; 4+ messages in thread
From: Jakub Jelinek @ 2002-12-31 8:53 UTC (permalink / raw)
To: Glibc hackers
On Tue, Dec 31, 2002 at 05:07:52PM +0100, Jakub Jelinek wrote:
> Hi!
>
> While glibc from CVS up to Sat built just fine, with today's
> CVS I'm getting not completely reproduceable errors during make -jN
> (not make install), like:
>
> make[2]: Entering directory `/usr/src/build/186224-i686/BUILD/glibc-2.3.1-20021231/stdio-common'
> mkdir /usr/src/build/186224-i686/BUILD/glibc-2.3.1-20021231/build-i686-linux2.4/stdio-common
> /usr/bin/install: cannot remove `/usr/include/bits/stdio_lim.h': Permission denied
> make[2]: *** [/usr/include/bits/stdio_lim.h] Error 1
> make[2]: *** Waiting for unfinished jobs....
> make[2]: *** Waiting for unfinished jobs....
> make[2]: Leaving directory `/usr/src/build/186224-i686/BUILD/glibc-2.3.1-20021231/stdio-common'
> make[1]: *** [stdio-common/subdir_lib] Error 2
>
> Got this twice on i686 (once in NPTL and once in linuxthreads build), once on i386,
> once on x86_64 (from 4 builds on all arches, the remaining arches built fine).
>
> Have tried to add back
> +# Convenient target to update all the generated source files.
> +.PHONY: generated
> +generated: $(addprefix $(common-objpfx),$(common-generated)) \
> + $(addprefix $(objpfx),$(generated))
> +
>
> to Rules (and remove generated += $(foreach s,.c .S l.c l.S f.c f.S,$(calls:s_%=m_%$s))
> from math/Makefile, since then IA-64 wouldn't build), but it happened again.
>
> Any ideas what's going on (ie. why something other than make install is
> attempting to install files)?
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
Jakub
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] Fix glibc Makefile issues
2002-12-31 8:53 ` Jakub Jelinek
@ 2002-12-31 9:53 ` Jakub Jelinek
2002-12-31 13:14 ` Roland McGrath
0 siblings, 1 reply; 4+ messages in thread
From: Jakub Jelinek @ 2002-12-31 9:53 UTC (permalink / raw)
To: Ulrich Drepper, Roland McGrath; +Cc: Glibc hackers
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fix glibc Makefile issues
2002-12-31 9:53 ` [PATCH] Fix " Jakub Jelinek
@ 2002-12-31 13:14 ` Roland McGrath
0 siblings, 0 replies; 4+ messages in thread
From: Roland McGrath @ 2002-12-31 13:14 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: Ulrich Drepper, Glibc hackers
> Seems like ASSEMBLER was not defined when generating the dependencies.
> Most of the headers use __ASSEMBLER__ anyway, so I've switched to that.
Being consistent about it is fine, but the makefile bug should be fixed
rather than worked around. I've checked in a fix so that -DASSEMBLER gets
into the deps run as it should.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2002-12-31 21:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-12-31 8:08 glibc Makefile issues Jakub Jelinek
2002-12-31 8:53 ` Jakub Jelinek
2002-12-31 9:53 ` [PATCH] Fix " Jakub Jelinek
2002-12-31 13:14 ` Roland McGrath
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).