From: Andreas Jaeger Date: Mon, 17 Jun 2002 09:21:32 +0000 (+0000) Subject: Merge from mainline. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=257f0490edadb8d5398af62967428be66c48ee8b;p=thirdparty%2Fglibc.git Merge from mainline. --- diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 834509eb82f..c7634e7aba6 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,7 @@ +2002-06-17 Andreas Jaeger + + * sysdeps/unix/sysv/linux/x86_64/Makefile: Merge from mainline. + 2002-05-20 Ulrich Drepper * sysdeps/alpha/pt-machine.c (THREAD_SELF): Remove clobber. diff --git a/linuxthreads/sysdeps/unix/sysv/linux/x86_64/Makefile b/linuxthreads/sysdeps/unix/sysv/linux/x86_64/Makefile new file mode 100644 index 00000000000..b65099f48fc --- /dev/null +++ b/linuxthreads/sysdeps/unix/sysv/linux/x86_64/Makefile @@ -0,0 +1,10 @@ +ifeq ($(subdir),linuxthreads) +CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions -fno-asynchronous-unwind-tables +# gcc -m64 has /usr/lib64/crti.o hardcoded in the specs file, because otherwise +# it would normally find 32bit crti.o. +LDFLAGS-pthread.so += -specs=$(objpfx)specs +before-compile += $(objpfx)specs +generated += specs +$(objpfx)specs: + $(CC) $(CFLAGS) $(CPPFLAGS) -dumpspecs | sed 's_/usr/lib64/crti.o_crti.o_g' > $@ +endif