Juergen Sawinski:

package/base/dietlibc/config-350.hlp

@@ -34,3 +34,12 @@ ROCKCFG_DIETLIBC_ALL
   Please check here if you wnt to build all packages with dietlibc
   which support it.
   Uncheck to select individual packages.
+
+MENU_PKG_DIETLIBC_FEATURES
+  Here you find special (adjustable) features of dietlibc
+
+ROCKCFG_DIETWANT_SYSENTER
+  On i386, Linux has an alternate syscall method since 2002/12/16
+  on my Athlon XP, it is twice as fast, but it's only in kernel 2.5
+  20040118: enabling this breaks User Mode Linux!  It's their fault.
+

package/base/dietlibc/config-350.in

@@ -25,6 +25,10 @@ then
   menu_begin MENU_PKG_DIETLIBC 'Dietlibc Options'
 	bool 'Enable dietlibc support' ROCKCFG_DIETLIBC 0
 	if [ $ROCKCFG_DIETLIBC = 1 ] ; then
+		menu_begin MENU_PKG_DIETLIBC_FEATURES 'Special features'
+			bool 'WANT_SYSENTER' \
+				ROCKCFG_DIETWANT_SYSENTER 1
+		menu_end
 		bool 'Link binaries dynamically with dietlibc' \
 						ROCKCFG_DIETLIBC_DYN 0
 						

package/base/dietlibc/dietlibc.conf

@@ -38,8 +38,14 @@ EOT
 		done
 	fi
 
+	# special features
+	if ! [ "$ROCKCFG_DIETWANT_SYSENTER" = "1" ]; then
+		sed -i "s,^#define WANT_SYSENTER$,/*\0*/," dietfeatures.h
+	fi
+
+	# build package
 	if [ "$crossnative" = native ] ; then
-		# dietlibc uses uname - so we always need to set ARCH
+		# dietlibc uses uname - so we always need to set MYARCH
 		eval "$MAKE MYARCH=$cpu $makeopt"
 		if [ $toolsdir = tools.cross ] ; then
 			cp -v bin-*/diet-i     $toolsbin/diet     || true

target/bootdisk/build.sh

@@ -13,7 +13,7 @@ fi
 
 # Add tools.cross/diet-bin/ to path so we find our 'diet' program
 PATH="$base/build/${ROCKCFG_ID}/ROCK/$toolsdir/diet-bin:$PATH"
-
+export DIETHOME="$base/build/${ROCKCFG_ID}/usr/dietlibc"
 
 if [ "$ROCK_DEBUG_BOOTDISK_NOSTAGE2" != 1 ]
 then

target/bootdisk/config.in

@@ -77,6 +77,7 @@ ROCKCFGSET_DIETLIBC_bzip2=1
 ROCKCFGSET_DIETLIBC_wget=1
 ROCKCFGSET_DIETLIBC_gawk=1
 ROCKCFGSET_DIETLIBC_iproute2=1
+ROCKCFGSET_DIETWANT_SYSENTER=0
 
 ROCKCFGSET_PKG_TERMCAP_USEIT=1
 ROCKCFGSET_PKG_GCC2_NO_CHILL=1