amd64/163710: setjump in userboot.so causes stack corruption

[Russell Cattelan]

The following reply was made to PR amd64/163710; it has been noted by GNATS.

From: Russell Cattelan <cattelan at thebarn.com>
To: bug-followup at FreeBSD.org, cattelan at thebarn.com
Cc:  
Subject: Re: amd64/163710: setjump in userboot.so  causes stack corruption
Date: Fri, 10 Feb 2012 22:04:52 -0600

 So here is a suggestion.
 
 So the default build does do the right thing.
 
 The problem is when doing userboot development the
 symlink from the loader build ends up including the wrong
 files.
 
 the userboot build of fill does not need a sym link so make
 sure the link does not exist when doing the build.
 
 This make sure the right header files are used for userboot builds=20
 
 diff --git a/sys/boot/userboot/ficl/Makefile =
 b/sys/boot/userboot/ficl/Makefile
 index 829ae1e..6249eb2 100644
 --- a/sys/boot/userboot/ficl/Makefile
 +++ b/sys/boot/userboot/ficl/Makefile
 @@ -61,6 +61,10 @@ softcore.c: ${SOFTWORDS} softcore.awk
   (cd ${.CURDIR}/../../ficl/softwords; cat ${SOFTWORDS} \
       | awk -f softcore.awk -v datestamp=3D"`LC_ALL=3DC date`") > =
 ${.TARGET}
 =20
 +beforedepend ${OBJS}: no-machine
 +
 +no-machine:
 + rm -f   ${.CURDIR}/../../ficl/machine
  #.if ${MACHINE_CPUARCH} =3D=3D "amd64"
  #${SRCS:M*.c:R:S/$/.o/g}: machine
  #