[oe-commits] org.oe.dev uclibc: fix extra/scripts/gen_bits_syscall_h.sh for arm

[woglinde2 commit]

uclibc: fix extra/scripts/gen_bits_syscall_h.sh for arm
* gen_bits_syscall_h.sh worked right for serval years
* unistd.h for arm contains now some syscalls starting with __ARM_NR_
* and thats why they don't get parsed over to the uclibc-header
* they are seldom used, but the cacao-javavm use one of them
* unistd_arm.patch fixes this issues

Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: a1b53f4890a543077cd9692d6f36d55601cf5cba
ViewMTN: http://monotone.openembedded.org/revision/info/a1b53f4890a543077cd9692d6f36d55601cf5cba
Files:
1
packages/uclibc/files/unistd_arm.patch
packages/uclibc/uclibc_0.9.29.bb
Diffs:

#
# mt diff -r28eb07d6a6a5b351641358d72f43af55409d099f -ra1b53f4890a543077cd9692d6f36d55601cf5cba
#
#
#
# add_file "packages/uclibc/files/unistd_arm.patch"
#  content [a6fa257e62c58f7720ff770fd7399ea40362b47e]
# 
# patch "packages/uclibc/uclibc_0.9.29.bb"
#  from [dcea97ba0c59569369e1dfcb5835ea52674d209e]
#    to [e670b8966480e150375aa74c2bd62de6c8e5315b]
#
============================================================
--- packages/uclibc/files/unistd_arm.patch	a6fa257e62c58f7720ff770fd7399ea40362b47e
+++ packages/uclibc/files/unistd_arm.patch	a6fa257e62c58f7720ff770fd7399ea40362b47e
@@ -0,0 +1,30 @@
+Index: uClibc-0.9.29/extra/scripts/gen_bits_syscall_h.sh
+===================================================================
+--- uClibc-0.9.29.orig/extra/scripts/gen_bits_syscall_h.sh	2006-12-12 04:30:02.000000000 +0100
++++ uClibc-0.9.29/extra/scripts/gen_bits_syscall_h.sh	2008-03-10 23:20:52.000000000 +0100
+@@ -24,8 +24,8 @@
+ ( echo "#include <asm/unistd.h>";
+   echo "#include <asm/unistd.h>" |
+   $CC -E $CC_SYSNUM_ARGS $INCLUDE_OPTS - |
+-  sed -ne 's/^[ ]*#define[ ]*__NR_\([A-Za-z0-9_]*\).*/UCLIBC_\1 __NR_\1/gp' \
+-      -e 's/^[ ]*#undef[ ]*__NR_\([A-Za-z0-9_]*\).*/UNDEFUCLIBC_\1 __NR_\1/gp' # needed to strip out any kernel-internal defines
++  sed -ne 's/^[ ]*#define[ ]*\(__ARM_NR_\|__NR_\)\([A-Za-z0-9_]*\).*/UCLIBC\1\2 \1\2/gp' \
++      -e 's/^[ ]*#undef[ ]*\(__ARM_NR_\|__NR_\)\([A-Za-z0-9_]*\).*/UNDEFUCLIBC\1\2 \1\2/gp' # needed to strip out any kernel-internal defines
+ ) |
+ $CC -E $INCLUDE_OPTS - |
+ ( echo "/* WARNING!!! AUTO-GENERATED FILE!!! DO NOT EDIT!!! */" ; echo ;
+@@ -35,10 +35,10 @@
+   echo "#ifndef _SYSCALL_H" ;
+   echo "# error \"Never use <bits/sysnum.h> directly; include <sys/syscall.h> instead.\"" ;
+   echo "#endif" ; echo ;
+-  sed -ne 's/^UCLIBC_\([A-Za-z0-9_]*\) *\(.*\)/#undef __NR_\1\
+-#define __NR_\1 \2\
+-#define SYS_\1 __NR_\1/gp' \
+-     -e 's/^UNDEFUCLIBC_\([A-Za-z0-9_]*\).*/#undef __NR_\1/gp'
++  sed -ne 's/^UCLIBC\(__ARM_NR_\|__NR_\)\([A-Za-z0-9_]*\) *\(.*\)/#undef \1\2\
++#define \1\2 \3\
++#define SYS_\2 \1\2/gp' \
++     -e 's/^UNDEFUCLIBC\(__ARM_NR_\|__NR_\)\([A-Za-z0-9_]*\).*/#undef \1\2/gp'
+   echo ;
+   echo "#endif" ;
+ )
============================================================
--- packages/uclibc/uclibc_0.9.29.bb	dcea97ba0c59569369e1dfcb5835ea52674d209e
+++ packages/uclibc/uclibc_0.9.29.bb	e670b8966480e150375aa74c2bd62de6c8e5315b
@@ -7,7 +7,7 @@ UCLIBC_BASE ?= "0.9.29"
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.29"
-PR = "r12"
+PR = "r13"
 
 require uclibc.inc
 
@@ -16,6 +16,7 @@ SRC_URI += "file://uClibc.machine file:/
 SRC_URI += "file://uClibc.machine file://uClibc.distro \
 	    file://errno_values.h.patch;patch=1 \
 	    file://termios.h.patch;patch=1 \
+	    file://unistd_arm.patch;patch=1 \
             file://uClibc-0.9.29-001-fix-mmap.patch;patch=1 \
             file://uClibc-0.9.29-002-atmel.1.patch;patch=1 \
             file://uClibc-0.9.29-avr32-fix-sa_onstack.patch;patch=1 \