--v86d)

			CMD_V86D=1

			print_info 2 "CMD_V86D: ${CMD_V86D}"

			;;

compile_v86d() {

	if [ ! -f "${V86D_BINCACHE}" ]

	then

		local myARCH="${ARCH}" myABI="${ABI}"

		if [ -z "$(grep V86D ${KERNEL_DIR}/include/linux/connector.h)" ]; then

			gen_die "You a kernel tree patched with uvesafb for v86d. Kernel not patched with uvesafb."

		fi

		case ${ARCH} in

			amd64) a=x86_64 ;;

			mips) gen_die 'TODO: Use the $ABI' ;;

			x86) a=i386 ;;

			*) a=${ARCH} ;;

		esac

		KLIBCARCH=${a}

		case ${ARCH} in

			# Merged arches

			x86|amd64) a=x86 ;;

			ppc*) a=powerpc ;;

			# Non-merged

			alpha|arm|ia64|m68k|mips|sh|sparc*) a=${ARCH} ;;

			*) gen_die "TODO: Update the code for your asm-ARCH symlink" ;;

		esac

		KLIBCASMARCH=${a}

		unset ABI ARCH KBUILD_OUTPUT

		# klibc

		print_info 1 'v86d: >> Unpacking klibc...'

		[ ! -f "${KLIBC_SRCTAR}" ] &&

			gen_die "Could not find klibc source tarball: ${KLIBC_SRCTAR}. Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"

		cd "${TEMP}"

		rm -rf "${KLIBC_DIR}"

		tar -xpf "${KLIBC_SRCTAR}"

		[ ! -d "${KLIBC_DIR}" ] &&

			gen_die "klibc directory ${KLIBC_DIR} invalid"

		cd "${KLIBC_DIR}"

		# point klibc to kernel sourse

		ln -snf "${KERNEL_DIR}" linux

		apply_patches klibc ${KLIBC_VER}

		# compile klibc

		print_info 1 'v86d: >> Compiling klibc...'

		${UTILS_MAKE} \

			EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \

			EXTRA_KLIBCLDFLAGS="-z,noexecstack" \

			HOSTCC="${UTILS_CC}" CC="${UTILS_CC}" \

			LD="${UTILS_LD}" AS="${UTILS_AS}" \

			INSTALLDIR="${TEMP}/klibc-install" \

			KLIBCARCH=${KLIBCARCH} \

			KLIBCASMARCH=${KLIBCASMARCH} \

			SHLIBDIR="${TEMP}/klibc-install/lib" \

			libdir="${TEMP}/klibc-install/lib" \

			bindir="${TEMP}/klibc-install/bin" \

			mandir="${TEMP}/klibc-install/usr/share/man" install >> ${LOGFILE} 2>&1 || gen_die "Failed to compile klibc"

		linkname="${TEMP}/klibc-install/include/asm"

		if [ -L "${linkname}" ] && [ ! -e "${linkname}" ]; then

			ln -snf asm-${KLIBCASMARCH} "${linkname}"

		fi

		# v86d

		print_info 1 'v86d: >> Unpacking v86d...'

		[ ! -f "${V86D_SRCTAR}" ] &&

			gen_die "Could not find v86d source tarball: ${V86D_SRCTAR}. Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"

		cd "${TEMP}"

		rm -rf "${V86D_DIR}"

		tar -xpf "${V86D_SRCTAR}"

		[ ! -d "${V86D_DIR}" ] &&

			gen_die "v86d directory ${V86D_DIR} invalid"

		cd "${V86D_DIR}"

		apply_patches v86d ${V86D_VER}

		print_info 1 'v86d: >> Configuring...'

		./configure --with-klibc >> ${LOGFILE} 2>&1 ||

			gen_die 'Configuring v86d failed!'

		print_info 1 'v86d: >> Compiling...'

		${UTILS_MAKE} KDIR="${KERNEL_DIR}" CC="${TEMP}/klibc-install/bin/klcc" >> ${LOGFILE} 2>&1 ||

			gen_die 'Compiling v86d failed!'

		print_info 1 'v86d: >> Copying to cache...'

		[ -f "v86d" ] ||

			gen_die 'v86d executable does not exist!'

		strip "v86d" ||

			gen_die 'Could not strip v86d binary!'

		bzip2 "v86d" ||

			gen_die 'bzip2 compression of v86d failed!'

		mv "v86d.bz2" "${V86D_BINCACHE}" ||

			gen_die 'Could not copy the v86d binary to the package directory, does the directory exist?'

		cd ..

		rm -rf "${V86D_DIR}"

		ARCH="${myARCH}" ABI="${myABI}"

	fi

}

	set_config_with_override 1 V86D                 CMD_V86D

	V86D_BINCACHE=`cache_replace "${V86D_BINCACHE}"`

	V86D_BINCACHE=`arch_replace "${V86D_BINCACHE}"`

	mknod -m 666 zero c 1 5

	mknod -m 600 mem c 1 1

append_v86d(){

	if [ -d "${TEMP}/initramfs-v86d-temp" ]

	then

		rm -r "${TEMP}/initramfs-v86d-temp/"

	fi

	cd ${TEMP}

	mkdir -p "${TEMP}/initramfs-v86d-temp/sbin/"

	[ "${V86D}" -eq '1' ] && { /bin/bzip2 -dc "${V86D_BINCACHE}" > "${TEMP}/initramfs-v86d-temp/sbin/v86d" ||

		gen_die "Could not extract v86d binary cache!"; }

	chmod a+x "${TEMP}/initramfs-v86d-temp/sbin/v86d"

	cd "${TEMP}/initramfs-v86d-temp/"

	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"

	rm -rf "${TEMP}/initramfs-v86d-temp" > /dev/null

}

	append_data 'v86d' "${V86D}"

	if [ "${V86D}" -eq '1' ]; then

		cp "${V86D_BINCACHE}" "${TEMP}/initrd-temp/sbin/v86d.bz2" ||

			gen_die 'Could not copy v86d from bincache!'

		bunzip2 "${TEMP}/initrd-temp/sbin/v86d.bz2" ||

			gen_die 'Could not uncompress v86d!'

		chmod +x "${TEMP}/initrd-temp/sbin/v86d"

	fi

	[ "${V86D}" -eq '1' ] && compile_v86d

KLIBC_VER="VERSION_KLIBC"

KLIBC_SRCTAR="${DISTDIR}/klibc-${KLIBC_VER}.tar.bz2"

KLIBC_DIR="klibc-${KLIBC_VER}"

V86D_VER="VERSION_V86D"

V86D_SRCTAR="${DISTDIR}/v86d-${V86D_VER}.tar.bz2"

V86D_DIR="v86d-${V86D_VER}"

V86D_BINCACHE="%%CACHE%%/v86d-${V86D_VER}-%%ARCH%%.bz2"

diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild

index c2bfd2f..8066bda 100644

--- a/usr/klibc/Kbuild

+++ b/usr/klibc/Kbuild

@@ -152,7 +152,7 @@ # build interp.o

 targets += interp.o

 quiet_cmd_interp = BUILD   $@

-      cmd_interp = $(KLIBCCC) $(klibccflags) -D__ASSEMBLY__     \

+      cmd_interp = $(KLIBCCC) $(klibccflags) $(EXTRA_KLIBCAFLAGS) -D__ASSEMBLY__     \

                              -DLIBDIR=\"$(SHLIBDIR)\"         \

 			     -DSOHASH=\"$(SOLIBHASH)\" \

 			     -c -o $@ $<

diff -Naurp klibc-1.5.7-orig/klcc/klcc.in klibc-1.5.7/klcc/klcc.in

--- klibc-1.5.7-orig/klcc/klcc.in	2007-12-03 01:17:26.000000000 +0100

--- a/scripts/Kbuild.install	2007-03-04 02:52:10.000000000 +0100

+++ b/scripts/Kbuild.install    2007-11-04 15:43:28.000000000 +0100

@@ -84,6 +84,13 @@

 # 1) Create directories, install headers and man pages

 # 2) Tell that we now install binaries

 # 3) Install binaries by descending

+

+# Arch specific definitions for klibc

+include $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG

+

+# include/asm-* architecture

+KLIBCASMARCH      ?= $(KLIBCARCH)

+

 .PHONY: header footer descend

 header:

 	$(Q)echo "  INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"

@@ -95,7 +102,7 @@

 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include

 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib

 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin

-	$(Q)set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \

+	$(Q)set -e ; for d in linux scsi asm-$(KLIBCASMARCH) asm-generic $(ASMKLIBCARCH); do \

 	  mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)include/$$d ; \

 	  for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \

 	           $(KLIBCKERNELOBJ)/include2 ; do \

---

 usr/include/arch/ppc/klibc/archsignal.h   |    6 ++++++

 usr/include/arch/sparc/klibc/archsignal.h |    7 -------

 2 files changed, 6 insertions(+), 7 deletions(-)

--- a/usr/include/arch/ppc/klibc/archsignal.h

+++ b/usr/include/arch/ppc/klibc/archsignal.h

@@ -8,7 +8,13 @@

 #ifndef _KLIBC_ARCHSIGNAL_H

 #define _KLIBC_ARCHSIGNAL_H

+#ifdef _SIGNAL_H

+#undef _SIGNAL_H

 #include <asm/signal.h>

+#define _SIGNAL_H

+#else

+#include <asm/signal.h>

+#endif

 /* No special stuff for this architecture */

 #endif

--- a/usr/include/arch/sparc/klibc/archsignal.h

+++ b/usr/include/arch/sparc/klibc/archsignal.h

@@ -11,13 +11,6 @@

 #define __WANT_POSIX1B_SIGNALS__

 #include <asm/signal.h>

-struct sigaction {

-	__sighandler_t	sa_handler;

-	unsigned long	sa_flags;

-	void		(*sa_restorer)(void);	/* Not used by Linux/SPARC */

-	sigset_t	sa_mask;

-};

-

 /* Not actually used by the kernel... */

 #define SA_RESTORER	0x80000000