Re: failure to build in src/regress/sys/arch/m68k/060sp

["Kurt J. Lidl" <lidl%pix.net@localhost>]

On Thu, Mar 27, 2008 at 09:16:57AM +0200, Alan Barrett wrote:
> On Thu, 27 Mar 2008, Alan Barrett wrote:
> > On Wed, 26 Mar 2008, Kurt J. Lidl wrote:
> > > For the last 24+ hours, I've been seeing the following build
> > > failure for the mvme68k port.  (Cross-built on a solaris 10
> > > sparc64 machine, but I don't think it matters for this case.)
> > 
> > src/sys/arch/m68k/060sp/asm2gas is using the host system's "sed" where
> > it should be using ${TOOL_SED}.
> 
> OK, this should be fixed now.  Please update both
> src/regress/sys/arch/m68k/060sp and src/sys/arch/m68k/060sp.

Well, visual inspection of the updated file shows it
wouldn't work.  You only corrected the first invocation of 'sed'
with the "${TOOL_SED}" replacement, and left the second two
invocations unmodified.

With the following diffs, it builds all the way for me now.
Thanks for looking into the problem.  (I found a similar set
of changes in the src/sys/arch/m68k/fpsp directory, and made
them be more similar to what you did in the 060sp directory.
I haven't built them, so a typo might exist there.)

-Kurt

Index: sys/arch/m68k/060sp/asm2gas
===================================================================
RCS file: /cvsroot/src/sys/arch/m68k/060sp/asm2gas,v
retrieving revision 1.7
diff -u -r1.7 asm2gas
--- sys/arch/m68k/060sp/asm2gas 27 Mar 2008 07:15:16 -0000      1.7
+++ sys/arch/m68k/060sp/asm2gas 28 Mar 2008 02:59:57 -0000
@@ -80,7 +80,7 @@
     G
     s/\n//
   }
-' | sed -e '
+' | "${TOOL_SED}" -e '
   # operator conversion
 
   s/^  section 7/      .text/
@@ -138,7 +138,7 @@
   /^   db[a-z][a-z]*\.w        /{s/\.w//;p;d;}
   /^   fb[a-eg-z][a-z]*\.w     /{s/\.w//;p;d;}
   /^   fb[a-eg-z][a-z]*\.l     /{s/\.l/l/;p;d;}
-' | sed -e '
+' | "${TOOL_SED}" -e '
   # operand conversion
 
   s/\([^_a-zA-Z0-9]\)FPIAR\([^_a-zA-Z0-9]\)/\1FPI\2/g
Index: sys/arch/m68k/fpsp/Makefile
===================================================================
RCS file: /cvsroot/src/sys/arch/m68k/fpsp/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- sys/arch/m68k/fpsp/Makefile 24 Jun 2006 03:28:42 -0000      1.15
+++ sys/arch/m68k/fpsp/Makefile 28 Mar 2008 02:59:57 -0000
@@ -37,7 +37,7 @@
 #
 
 .include <bsd.prog.mk>
-#.include <bsd.sys.mk>         # for HOST_SH
+.include <bsd.sys.mk>          # for HOST_SH, TOOL_SED
 
 TARGET = fpsp
 
@@ -77,9 +77,9 @@
 PREFIX         = L_
 
 .sa.s:
-       SED=${TOOL_SED:Q} ${HOST_SH} ${FPSPDIR}/asm2gas ${.IMPSRC} >${.TARGET}
+       TOOL_SED=${TOOL_SED:Q} ${HOST_SH} ${FPSPDIR}/asm2gas ${.IMPSRC} 
>${.TARGET}
 .h.defs:
-       SED=${TOOL_SED:Q} ${HOST_SH} ${FPSPDIR}/asm2gas ${.IMPSRC} >${.TARGET}
+       TOOL_SED=${TOOL_SED:Q} ${HOST_SH} ${FPSPDIR}/asm2gas ${.IMPSRC} 
>${.TARGET}
 .s.o:
        ${CC} ${AFLAGS} ${CPPFLAGS} -c -o ${.TARGET} ${.IMPSRC}
 
Index: sys/arch/m68k/fpsp/asm2gas
===================================================================
RCS file: /cvsroot/src/sys/arch/m68k/fpsp/asm2gas,v
retrieving revision 1.8
diff -u -r1.8 asm2gas
--- sys/arch/m68k/fpsp/asm2gas  24 Jun 2006 03:28:42 -0000      1.8
+++ sys/arch/m68k/fpsp/asm2gas  28 Mar 2008 02:59:57 -0000
@@ -40,8 +40,9 @@
 # This ugly script converts assembler code from Motorola's format to a
 # form that gas (MIT syntax) can digest.
 
-: ${SED:=sed}
-cat $1 | ${SED} -e '
+: ${TOOL_SED:=sed}
+
+cat $1 | "${TOOL_SED}" -e '
   # format canonicalization
 
   /[   ]IDNT[  ]/{s/^/|/;p;d;}
@@ -78,7 +79,7 @@
     G
     s/\n//
   }
-' | ${SED} -e '
+' | "${TOOL_SED}" -e '
   # operator conversion
 
   s/^  section 7/      .text/
@@ -136,7 +137,7 @@
   /^   db[a-z][a-z]*\.w        /{s/\.w//;p;d;}
   /^   fb[a-eg-z][a-z]*\.w     /{s/\.w//;p;d;}
   /^   fb[a-eg-z][a-z]*\.l     /{s/\.l/l/;p;d;}
-' | ${SED} -e '
+' | "${TOOL_SED}" -e '
   # operand conversion
 
   s/\([^_a-zA-Z0-9]\)FPIAR\([^_a-zA-Z0-9]\)/\1%FPI\2/g
@@ -194,7 +195,7 @@
        s/,\(%[fF][pP][0-7]\)   /,\1-\1 /
        s/,\(%[fF][pP][0-7]\)$/,\1-\1/
   }
-' | ${SED} -e '
+' | "${TOOL_SED}" -e '
   # Floating point literal conversion
 
   s/:0x41dfffffffc00000/0r2147483647.0/g