eglibc: update patches for AArch64

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

diff --git a/meta/recipes-core/eglibc/eglibc-2.16/aarch64-glibc-fsf-v1-eaf6f205.patch b/meta/recipes-core/eglibc/eglibc-2.16/aarch64-0001-glibc-fsf-v1-eaf6f205.patch
similarity index 99%
rename from meta/recipes-core/eglibc/eglibc-2.16/aarch64-glibc-fsf-v1-eaf6f205.patch
rename to meta/recipes-core/eglibc/eglibc-2.16/aarch64-0001-glibc-fsf-v1-eaf6f205.patch
index f0c3b74175215c7bc8ffcf4857a3986436e191bd..7738a953e9d11d1b17eb591b728ebb5cbe4e9111 100644 (file)
--- a/meta/recipes-core/eglibc/eglibc-2.16/aarch64-glibc-fsf-v1-eaf6f205.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.16/aarch64-0001-glibc-fsf-v1-eaf6f205.patch
@@ -1,6 +1,7 @@
 import http://sourceware.org/ml/libc-alpha/2012-10/msg00008.html
 
 Upstream-Status: merged into trunk
+
 diff -x .git -uNr glibc.orig/ports/sysdeps/aarch64/Implies glibc/ports/sysdeps/aarch64/Implies
 --- glibc.orig/ports/sysdeps/aarch64/Implies   1970-01-01 01:00:00.000000000 +0100
 +++ glibc/ports/sysdeps/aarch64/Implies        2012-09-24 12:41:10.000000000 +0100

diff --git a/meta/recipes-core/eglibc/eglibc-2.16/aarch64-0002-Synchronize-with-linux-elf.h.patch b/meta/recipes-core/eglibc/eglibc-2.16/aarch64-0002-Synchronize-with-linux-elf.h.patch
new file mode 100644 (file)
index 0000000..390480b
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.16/aarch64-0002-Synchronize-with-linux-elf.h.patch
@@ -0,0 +1,40 @@
+Upstream-Status: backport
+
+Dropped ChangeLog part as it does not apply.
+
+From 2abe9f1507f971d1513a2d75a865ec4615d2d6b8 Mon Sep 17 00:00:00 2001
+From: Petr Machata <pmachata@redhat.com>
+Date: Thu, 6 Sep 2012 12:41:14 -0700
+Subject: [PATCH] Synchronize with linux/elf.h.
+
+Add new ARM and s390 note constants e.g. NT_*.
+---
+ ChangeLog | 7 +++++++
+ elf/elf.h | 9 +++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index 7385bcb..986ed54 100644
+diff --git a/elf/elf.h b/elf/elf.h
+index 6c85f92..41fc3bd 100644
+--- a/elf/elf.h
++++ b/elf/elf.h
+@@ -622,6 +622,15 @@ typedef struct
+ #define NT_386_TLS    0x200           /* i386 TLS slots (struct user_desc) */
+ #define NT_386_IOPERM 0x201           /* x86 io permission bitmap (1=deny) */
+ #define NT_X86_XSTATE 0x202           /* x86 extended state using xsave */
++#define NT_S390_HIGH_GPRS     0x300   /* s390 upper register halves */
++#define NT_S390_TIMER 0x301           /* s390 timer register */
++#define NT_S390_TODCMP        0x302           /* s390 TOD clock comparator register */
++#define NT_S390_TODPREG       0x303           /* s390 TOD programmable register */
++#define NT_S390_CTRS  0x304           /* s390 control registers */
++#define NT_S390_PREFIX        0x305           /* s390 prefix register */
++#define NT_S390_LAST_BREAK    0x306   /* s390 breaking event address */
++#define NT_S390_SYSTEM_CALL   0x307   /* s390 system call restart data */
++#define NT_ARM_VFP    0x400           /* ARM VFP/NEON registers */
+ 
+ /* Legal values for the note segment descriptor types for object files.  */
+ 
+-- 
+1.8.0
+

diff --git a/meta/recipes-core/eglibc/eglibc-2.16/aarch64-glibc-v3-elf.patch b/meta/recipes-core/eglibc/eglibc-2.16/aarch64-0003-Adding-AArch64-support-to-elf-elf.h.patch
similarity index 80%
rename from meta/recipes-core/eglibc/eglibc-2.16/aarch64-glibc-v3-elf.patch
rename to meta/recipes-core/eglibc/eglibc-2.16/aarch64-0003-Adding-AArch64-support-to-elf-elf.h.patch
index bad9feb12b1ae7e4e87641df08ef81acf3c175bc..1c547e4b8a0d99c09861cd0ce6ebc152f490c276 100644 (file)
--- a/meta/recipes-core/eglibc/eglibc-2.16/aarch64-glibc-v3-elf.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.16/aarch64-0003-Adding-AArch64-support-to-elf-elf.h.patch
@@ -1,7 +1,19 @@
-import http://sourceware.org/ml/libc-alpha/2012-11/msg00240.html
+Upstream-Status: backport
 
-Upstream-Status: merged into trunk
+Dropped ChangeLog part as it does not apply.
 
+From 19b2ecfcae9ccd7f9a974e8d1869d45ecd7310bb Mon Sep 17 00:00:00 2001
+From: Marcus Shawcroft <marcus.shawcroft@linaro.org>
+Date: Wed, 7 Nov 2012 13:32:08 +0000
+Subject: [PATCH] Adding AArch64 support to elf/elf.h
+
+---
+ ChangeLog | 12 ++++++++++++
+ elf/elf.h | 18 ++++++++++++++++++
+ 2 files changed, 30 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index aeebbc4..69593de 100644
 diff --git a/elf/elf.h b/elf/elf.h
 index 2524924..5a9b13f 100644
 --- a/elf/elf.h
@@ -45,3 +57,6 @@ index 2524924..5a9b13f 100644
  /* ARM relocs.  */
  
  #define R_ARM_NONE            0       /* No reloc */
+-- 
+1.8.0
+

diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb
index 22abeb80b6c1ae209c0c89466eb12f0b32a02654..61e16bc9cdba42b72be76f09aede955573289eb7 100644 (file)
--- a/meta/recipes-core/eglibc/eglibc_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.16.bb
@@ -27,8 +27,9 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr21
            file://0001-Add-name_to_handle_at-open_by_handle-etc.-to-PowerPC.patch \
            file://fsl-ppc-no-fsqrt.patch \
            file://0001-R_ARM_TLS_DTPOFF32.patch \
-           file://aarch64-glibc-fsf-v1-eaf6f205.patch \
-           file://aarch64-glibc-v3-elf.patch \
+           file://aarch64-0001-glibc-fsf-v1-eaf6f205.patch \
+           file://aarch64-0002-Synchronize-with-linux-elf.h.patch \
+           file://aarch64-0003-Adding-AArch64-support-to-elf-elf.h.patch \
           "
 
 SRC_URI[md5sum] = "88894fa6e10e58e85fbd8134b8e486a8"