diff options
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/cygwin/Makefile.in | 6 | ||||
| -rwxr-xr-x | winsup/cygwin/speclib | 3 |
3 files changed, 12 insertions, 4 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 4ad195a1b..156e975bc 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -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. diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index ac4502dcd..6afa4f7ab 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -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 $@ $? diff --git a/winsup/cygwin/speclib b/winsup/cygwin/speclib index 40472045b..a5ce7f46b 100755 --- a/winsup/cygwin/speclib +++ b/winsup/cygwin/speclib @@ -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" |