--- /usr/portage/sys-libs/glibc/glibc-2.3.3.20040420-r1.ebuild	2004-08-18 14:38:04.000000000 +0200
+++ glibc-2.3.3.20040420-r1.ebuild	2004-08-30 12:20:48.868827368 +0200
@@ -191,8 +191,16 @@
 		local KERNEL_HEADERS="$(get_KHV "`KV_to_int ${MIN_NPTL_KV}`")"
 
 		einfon "Checking kernel headers for broken sysctl.h ... "
+		cat > ${T}/test-sysctl_h.c <<EOF
+#include <linux/sysctl.h>
+
+int main()
+{
+	return 0;
+}
+EOF
 		if ! gcc -I"${KERNEL_HEADERS}" \
-		         -c ${FILESDIR}/test-sysctl_h.c -o ${T}/test1.o &> /dev/null
+		         -c ${T}/test-sysctl_h.c -o ${T}/test1.o &> /dev/null
 		then
 			echo "yes"
 			echo
@@ -220,7 +228,14 @@
 	if use_nptl
 	then
 		einfon "Checking gcc for __thread support ... "
-		if ! gcc -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null
+		cat > ${T}/test-__thread.c <<EOF
+extern __thread int i;
+
+int main() {
+	return 0;
+}
+EOF
+		if ! gcc -c ${T}/test-__thread.c -o ${T}/test2.o &> /dev/null
 		then
 			echo "no"
 			echo