From: Chris Larson <clarson@kergoth.com>
Date: Mon, 22 Mar 2004 02:03:43 +0000 (+0000)
Subject: Patch courtesy Phil Blundell:
X-Git-Tag: Release-2010-05/1~19916
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7e9d99e929087d325b51941ad133b2fb879ccd0;p=openembedded.git

Patch courtesy Phil Blundell:
A couple of improvements for glibc:
	- import Nico Pitre's optimised memcpy routines (roughly doubles memcpy performance on pxa250)
	- fix longlong.h to use smull/umull/clz on machines that have them
	- avoid setting CPPFLAGS when calling configure, since setting it can negate the effect of --with-headers
	- avoid waitpid lossage by filtering out any definition of this syscall from unistd.h

BKrev: 405e497fwyUnfZ0t1db--hp1VVEDdQ
---

diff --git a/glibc/glibc-2.3.2/arm-longlong.patch b/glibc/glibc-2.3.2/arm-longlong.patch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/glibc/glibc-2.3.2/arm-memcpy.patch b/glibc/glibc-2.3.2/arm-memcpy.patch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/glibc/glibc_2.3.2.oe b/glibc/glibc_2.3.2.oe
index 5188b6a94a..4eb88bd832 100644
--- a/glibc/glibc_2.3.2.oe
+++ b/glibc/glibc_2.3.2.oe
@@ -71,7 +71,9 @@ SRC_URI = ftp://ftp.gnu.org/gnu/glibc/glibc-2.3.2.tar.gz \
 	  file://${FILESDIR}/hppa-syscall.patch;patch=1;pnum=0 \
 	  file://${FILESDIR}/glibc23-errno-hack.patch;patch=1;pnum=1 \
 	  file://${FILESDIR}/90_glibc232-statvfs.patch;patch=1;pnum=0 \
-	  file://${FILESDIR}/90_glibc232-timezones.patch;patch=1;pnum=0
+	  file://${FILESDIR}/90_glibc232-timezones.patch;patch=1;pnum=0 \
+	  file://${FILESDIR}/arm-memcpy.patch;patch=1;pnum=0 \
+	  file://${FILESDIR}/arm-longlong.patch;patch=1;pnum=0
 
 S="${WORKDIR}/${P}"
 B="${WORKDIR}/build-${TARGET_SYS}"
@@ -86,7 +88,9 @@ EXTRA_OECONF =  --without-tls --without-__thread --enable-kernel=2.4.3 \
 glibcbuild_do_unpack () {
 	mv "${WORKDIR}/linuxthreads" "${WORKDIR}/linuxthreads_db" "${S}/"
 # kernel headers
-	cp -a "${FILESDIR}/version.h" "${FILESDIR}/autoconf.h" "${WORKDIR}/linux/include/linux/"
+	cp -a "${FILESDIR}/autoconf.h" "${WORKDIR}/linux/include/linux/"
+	sed 's:\(^.*define.*__NR_waitpid.*$\):/*&*/:' < ${WORKDIR}/linux/include/asm-arm/unistd.h > ${WORKDIR}/linux/include/asm-arm/unistd.h.new
+	mv ${WORKDIR}/linux/include/asm-arm/unistd.h.new ${WORKDIR}/linux/include/asm-arm/unistd.h
 	case $TARGET_ARCH in
 		alpha*)   TARGET_ARCH=alpha ;;
 		arm*)     TARGET_ARCH=arm ;;
@@ -121,7 +125,9 @@ python do_unpack () {
 do_configure () {
 # override this function to avoid the autoconf/automake/aclocal/autoheader
 # calls for now
-	oe_runconf
+# don't pass CPPFLAGS into configure, since it upsets the kernel-headers
+# version check and doesn't really help with anything
+	CPPFLAGS="" oe_runconf
 }
 
 do_compile_prepend() {