Skip to content

Commit

Permalink
* Makefile (extra-objs, omit-deps): Add crtn.
Browse files Browse the repository at this point in the history
	($(objpfx)libpthread.so): Depend on $(objpfx)crtn.o.
	($(objpfx)libpthread.so: +postinit): Append $(objpfx)crtn.o.
	($(objpfx)crtn.S): New target.
	($(objpfx)crt%.o): Pattern rule replaces crti.o target.
	(generated): Add crtn.S.

	* sysdeps/unix/sysv/linux/x86_64/Makefile ($(objpfx)specs): Massage
	crtn.o pathname too.
  • Loading branch information
Roland McGrath committed Aug 31, 2002
1 parent c5e341e commit cc6d371
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 5 deletions.
12 changes: 12 additions & 0 deletions linuxthreads/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
2002-08-30 Roland McGrath <roland@redhat.com>

* Makefile (extra-objs, omit-deps): Add crtn.
($(objpfx)libpthread.so): Depend on $(objpfx)crtn.o.
($(objpfx)libpthread.so: +postinit): Append $(objpfx)crtn.o.
($(objpfx)crtn.S): New target.
($(objpfx)crt%.o): Pattern rule replaces crti.o target.
(generated): Add crtn.S.

* sysdeps/unix/sysv/linux/x86_64/Makefile ($(objpfx)specs): Massage
crtn.o pathname too.

2002-08-30 Jakub Jelinek <jakub@redhat.com>

* pthread.c (__pthread_initialize_minimal): Call __uselocale even
Expand Down
15 changes: 10 additions & 5 deletions linuxthreads/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ CFLAGS-tst-cancel.c = -fno-inline -fno-inline-functions
include ../Makeconfig

ifeq ($(build-shared),yes)
extra-objs += crti.o
omit-deps += crti
extra-objs += crti.o crtn.o
omit-deps += crti crtn

CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions
endif
Expand All @@ -76,8 +76,9 @@ endif
include ../Rules

extra-B-pthread.so = -B$(common-objpfx)linuxthreads/
$(objpfx)libpthread.so: $(objpfx)crti.o
$(objpfx)libpthread.so: $(objpfx)crti.o $(objpfx)crtn.o
$(objpfx)libpthread.so: +preinit += $(objpfx)crti.o
$(objpfx)libpthread.so: +postinit += $(objpfx)crtn.o

znodelete-yes = -DHAVE_Z_NODELETE
CFLAGS-mutex.c += -D__NO_WEAK_PTHREAD_ALIASES
Expand Down Expand Up @@ -127,15 +128,19 @@ $(objpfx)crti.S: $(objpfx)pt-initfini.s
sed -n -e '1,/@HEADER_ENDS/p' \
-e '/@_.*_PROLOG_BEGINS/,/@_.*_PROLOG_ENDS/p' \
-e '/@TRAILER_BEGINS/,$$p' $< > $@
$(objpfx)crtn.S: $(objpfx)pt-initfini.s
sed -n -e '1,/@HEADER_ENDS/p' \
-e '/@_.*_EPILOG_BEGINS/,/@_.*_EPILOG_ENDS/p' \
-e '/@TRAILER_BEGINS/,$$p' $< > $@

$(objpfx)defs.h: $(objpfx)pt-initfini.s
sed -n -e '/@TESTS_BEGIN/,/@TESTS_END/p' $< | \
$(AWK) -f ../csu/defs.awk > $@

$(objpfx)crti.o: $(objpfx)crti.S $(objpfx)defs.h
$(objpfx)crt%.o: $(objpfx)crt%.S $(objpfx)defs.h
$(compile.S) -g0 $(ASFLAGS-.os) -o $@

generated += crti.S defs.h pt-initfini.s
generated += crti.S crtn.S defs.h pt-initfini.s
endif

ifeq (yes,$(build-static-nss))
Expand Down

0 comments on commit cc6d371

Please sign in to comment.