* Makefile.in (libpthread.a): Pass the assembler also.

(libm.a): Ditto.
(libc.a): Ditto.
* speclib: Specify the assembler to dlltool.
This commit is contained in:
Christopher Faylor 2002-01-22 01:40:11 +00:00
parent 2290b86637
commit 51076b7360
3 changed files with 12 additions and 4 deletions

View File

@ -1,3 +1,10 @@
2002-01-21 DJ Delorie <dj@redhat.com>
* Makefile.in (libpthread.a): Pass the assembler also.
(libm.a): Ditto.
(libc.a): Ditto.
* speclib: Specify the assembler to dlltool.
2002-01-21 Christopher Faylor <cgf@redhat.com>
* include/cygwin/version.h: Bump DLL minor number.

View File

@ -280,13 +280,13 @@ dcrt0.o sigproc.o: child_info_magic.h
shared.o: shared_info_magic.h
libpthread.a: speclib cygwin.def pthread.o thread.o
/bin/sh ${word 1, $^} $@ "${NM}" "${DLLTOOL}" ${wordlist 2, 99, $^}
/bin/sh ${word 1, $^} $@ "${NM}" "${DLLTOOL}" "${AS}" ${wordlist 2, 99, $^}
$(PWD)/libm.a: speclib cygwin.def $(LIBM)
/bin/sh ${word 1, $^} $@ "${NM}" "${DLLTOOL}" ${wordlist 2, 99, $^}
/bin/sh ${word 1, $^} $@ "${NM}" "${DLLTOOL}" "${AS}" ${wordlist 2, 99, $^}
$(PWD)/libc.a: speclib cygwin.def $(PWD)/libm.a libpthread.a
/bin/sh ${word 1, $^} -v $@ "${NM}" "${DLLTOOL}" ${wordlist 2, 99, $^}
/bin/sh ${word 1, $^} -v $@ "${NM}" "${DLLTOOL}" "${AS}" ${wordlist 2, 99, $^}
lib%.a: %.o
$(AR) cru $@ $?

View File

@ -15,8 +15,9 @@ esac
lib=$1; shift
nm=$1; shift
dlltool=$1; shift
as=$1; shift
def=$1; shift
trap "rm /tmp/$$.def" 0 1 2 15
(echo "LIBRARY cygwin1.dll
EXPORTS"; $nm --extern-only --defined-only $* | sed -e '/^[ ]*$/d' -e '/:$/d' -e 's/^.* _\(.*\)/\1/' | grep $v -f - -w $def |egrep -vi '^library|exports|^$' | sort) > /tmp/$$.def
exec $dlltool -d /tmp/$$.def -l "$lib"
exec $dlltool --as=$as -d /tmp/$$.def -l "$lib"