From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ww0-f43.google.com ([74.125.82.43]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QoaNp-0000P8-O4 for openembedded-core@lists.openembedded.org; Wed, 03 Aug 2011 14:17:09 +0200 Received: by wwe32 with SMTP id 32so342517wwe.24 for ; Wed, 03 Aug 2011 05:12:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=C11KyggiMuKuy1g5TK/et1Q31YGXP31EXB17HcNNaLg=; b=nGtu4lr4ytkdrBg12RhlN/w3VUOJq3xboX0y7i/LvUAnLh65mXO4PJTHFtINfJdTk3 h87MfXdaqCLNrF1GgzIlG9a/8A1d0IhurlDcDknNQVYqFzzQIFfeHm7Gb0dhNJJ5aVFS ztkFeV3Bhg1WSg6bzlH/OORi3X2DTcCysgu+s= Received: by 10.216.44.202 with SMTP id n52mr42461web.47.1312373567279; Wed, 03 Aug 2011 05:12:47 -0700 (PDT) Received: from localhost.localdomain ([194.85.238.22]) by mx.google.com with ESMTPS id m38sm498753weq.45.2011.08.03.05.12.45 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 03 Aug 2011 05:12:45 -0700 (PDT) From: Dmitry Eremin-Solenikov To: openembedded-core@lists.openembedded.org Date: Wed, 3 Aug 2011 16:12:37 +0400 Message-Id: <1312373557-9324-1-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.7.2.3 Cc: Dmitry Eremin-Solenikov Subject: [PATCH V2] eglibc: fix build for armv4 machines X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2011 12:17:09 -0000 eglibc builds for arm-eabi unconditionally enables the libc-do-syscall.S file, which contains thumb assembly. It's unused in arm-eabi-nothumb case, so just ifdef the actual code. V2: use the patch from oe.dev. The patch is submitted to sourceware bugzilla by Khem Raj back in October of 2010, but the status is still UNCONFIRMED and the patch isn't commited. Signed-off-by: Dmitry Eremin-Solenikov Cc: Khem Raj --- .../eglibc-2.12/armv4-eabi-compile-fix.patch | 25 ++++++++++++++++++++ .../eglibc-2.13/armv4-eabi-compile-fix.patch | 25 ++++++++++++++++++++ meta/recipes-core/eglibc/eglibc_2.12.bb | 3 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 3 +- 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/eglibc/eglibc-2.12/armv4-eabi-compile-fix.patch create mode 100644 meta/recipes-core/eglibc/eglibc-2.13/armv4-eabi-compile-fix.patch diff --git a/meta/recipes-core/eglibc/eglibc-2.12/armv4-eabi-compile-fix.patch b/meta/recipes-core/eglibc/eglibc-2.12/armv4-eabi-compile-fix.patch new file mode 100644 index 0000000..c2407ee --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.12/armv4-eabi-compile-fix.patch @@ -0,0 +1,25 @@ +Source: http://sourceware.org/bugzilla/show_bug.cgi?id=12097 +Upstream-Status: Submitted + +The patch should be merged into glibc-ports + +-Khem +Index: libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S +=================================================================== +--- libc.orig/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S ++++ libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S +@@ -16,6 +16,8 @@ + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + ++#if defined(__thumb__) ++ + #include + + /* Out-of-line syscall stub. We expect the system call number in ip +@@ -41,3 +43,5 @@ ENTRY (__libc_do_syscall) + pop {r7, pc} + .fnend + END (__libc_do_syscall) ++ ++#endif /* __thumb__ */ diff --git a/meta/recipes-core/eglibc/eglibc-2.13/armv4-eabi-compile-fix.patch b/meta/recipes-core/eglibc/eglibc-2.13/armv4-eabi-compile-fix.patch new file mode 100644 index 0000000..c2407ee --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.13/armv4-eabi-compile-fix.patch @@ -0,0 +1,25 @@ +Source: http://sourceware.org/bugzilla/show_bug.cgi?id=12097 +Upstream-Status: Submitted + +The patch should be merged into glibc-ports + +-Khem +Index: libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S +=================================================================== +--- libc.orig/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S ++++ libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S +@@ -16,6 +16,8 @@ + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + ++#if defined(__thumb__) ++ + #include + + /* Out-of-line syscall stub. We expect the system call number in ip +@@ -41,3 +43,5 @@ ENTRY (__libc_do_syscall) + pop {r7, pc} + .fnend + END (__libc_do_syscall) ++ ++#endif /* __thumb__ */ diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb index 1ada892..ce16bd6 100644 --- a/meta/recipes-core/eglibc/eglibc_2.12.bb +++ b/meta/recipes-core/eglibc/eglibc_2.12.bb @@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += "gperf-native" -PR = "r20" +PR = "r21" SRCREV = "14158" @@ -11,6 +11,7 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http file://IO-acquire-lock-fix.patch \ file://shorten-build-commands.patch \ file://mips-rld-map-check.patch \ + file://armv4-eabi-compile-fix.patch \ file://etc/ld.so.conf \ file://generate-supported.mk \ " diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index 41fe7c7..ddca50f 100644 --- a/meta/recipes-core/eglibc/eglibc_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb @@ -3,7 +3,7 @@ require eglibc.inc SRCREV = "14157" DEPENDS += "gperf-native" -PR = "r9" +PR = "r10" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_13" @@ -13,6 +13,7 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http file://shorten-build-commands.patch \ file://mips-rld-map-check.patch \ file://stack-protector-test.patch \ + file://armv4-eabi-compile-fix.patch \ file://etc/ld.so.conf \ file://generate-supported.mk \ file://glibc_bug_fix_12454.patch \ -- 1.7.2.3