From 215dbbb1508bd6b86211112dd5ddaf9bd2290690 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 28 May 1996 17:54:52 +0000 Subject: Tue May 28 13:11:19 1996 Roland McGrath * Makerules (sed-remove-objpfx): Avoid extra space in regexp due to continuation line. * sysdeps/unix/sysv/linux/i386/socket.S: Fix off-by-one error in setting %ecx to 2nd syscall arg: we have pushed nothing, so function args are found at 4(%esp), not 8(%esp). --- Makerules | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Makerules') diff --git a/Makerules b/Makerules index f2c7a7d..15a0b0e 100644 --- a/Makerules +++ b/Makerules @@ -281,9 +281,11 @@ $(sed-remove-objpfx) > $(@:.d=.T) mv -f $(@:.d=.T) $@ endef ifneq (,$(objpfx)) -sed-remove-objpfx = -e 's@ $(subst .,\.,\ - $(subst @,\@,$(objpfx)))@ $$(objpfx)@g' \ - -e 's@^$(subst .,\.,$(subst @,\@,$(objpfx)))@$$(objpfx)@g' +# Continuation lines here are dangerous because they introduce spaces! +define sed-remove-objpfx +-e 's@ $(subst .,\.,$(subst @,\@,$(objpfx)))@ $$(objpfx)@g' \ +-e 's@^$(subst .,\.,$(subst @,\@,$(objpfx)))@$$(objpfx)@g' +endef endif # Figure out the source filenames in this directory. -- cgit v1.1