| Submitter | Steffen Sledz |
|---|---|
| Date | Sept. 15, 2011, 12:29 p.m. |
| Message ID | <1316089742-26495-1-git-send-email-sledz@dresearch-fe.de> |
| Download | mbox | patch |
| Permalink | /patch/11469/ |
| State | Accepted |
| Headers | show |
Comments
On 15.09.2011 14:29, Steffen Sledz wrote: > Enables building of OpenJDK which uses HWCAP_THUMBEE that is not present > in 2.6.24 headers and was introduced with > > commit d7f864be8323e5394040e2877594645b0e7da85d > Author: Catalin Marinas <catalin.marinas@arm.com> > Date: Fri Apr 18 22:43:06 2008 +0100 > > ARMv7: Add support for the ThumbEE state saving/restoring > > This patch adds the detection and handling of the ThumbEE extension on > ARMv7 CPUs. > > Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> > > Upstream-Status: Backport [2.6.26] > > Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de> > Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> > --- > [PATCH v5] contains updates in commit comment and patch header as a result of > Paul's review of [PATCH v4] especially the referenced linux commit. > --- > .../arm-hwcap-add-new-entries.patch | 31 ++++++++++++++++++++ > .../linux-libc-headers_2.6.24.bb | 6 ++- > 2 files changed, 35 insertions(+), 2 deletions(-) > create mode 100644 recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch > > diff --git a/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch > new file mode 100644 > index 0000000..80a7949 > --- /dev/null > +++ b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch > @@ -0,0 +1,31 @@ > +linux-libc-headers 2.6.24: backport arm/asm/hwcap.h from linux 2.6.26 > + > +Enables building of OpenJDK which uses HWCAP_THUMBEE that is not present > +in 2.6.24 headers and was introduced with > + > + commit d7f864be8323e5394040e2877594645b0e7da85d > + Author: Catalin Marinas <catalin.marinas@arm.com> > + Date: Fri Apr 18 22:43:06 2008 +0100 > + > + ARMv7: Add support for the ThumbEE state saving/restoring > + > + This patch adds the detection and handling of the ThumbEE extension on > + ARMv7 CPUs. > + > + Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> > + > +Upstream-Status: Backport [2.6.26] > + > +Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de> > + > +diff -Nurd linux-2.6.24.orig//include/asm-arm/hwcap.h linux-2.6.24/include/asm-arm/hwcap.h > +--- linux-2.6.24.orig//include/asm-arm/hwcap.h 2011-09-15 08:42:58.467307245 +0200 > ++++ linux-2.6.24/include/asm-arm/hwcap.h 2011-09-15 08:43:46.004693497 +0200 > +@@ -15,6 +15,7 @@ > + #define HWCAP_JAVA 256 > + #define HWCAP_IWMMXT 512 > + #define HWCAP_CRUNCH 1024 > ++#define HWCAP_THUMBEE 2048 > + > + #if defined(__KERNEL__) && !defined(__ASSEMBLY__) > + /* > diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb > index 148d03f..d7f67ed 100644 > --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb > +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb > @@ -2,13 +2,15 @@ require linux-libc-headers.inc > > INHIBIT_DEFAULT_DEPS = "1" > DEPENDS += "unifdef-native" > -PR = "r7" > +PR = "r8" > > SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ > file://procinfo.h \ > file://export_falloc_h.patch \ > file://make-3.82.patch \ > - file://unifdef.patch" > + file://unifdef.patch \ > + file://arm-hwcap-add-new-entries.patch \ > +" > > SRC_URI_append_hipox = " \ > file://siocoutqsnd.patch \ applied and pushed
Patch
diff --git a/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch new file mode 100644 index 0000000..80a7949 --- /dev/null +++ b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch @@ -0,0 +1,31 @@ +linux-libc-headers 2.6.24: backport arm/asm/hwcap.h from linux 2.6.26 + +Enables building of OpenJDK which uses HWCAP_THUMBEE that is not present +in 2.6.24 headers and was introduced with + + commit d7f864be8323e5394040e2877594645b0e7da85d + Author: Catalin Marinas <catalin.marinas@arm.com> + Date: Fri Apr 18 22:43:06 2008 +0100 + + ARMv7: Add support for the ThumbEE state saving/restoring + + This patch adds the detection and handling of the ThumbEE extension on + ARMv7 CPUs. + + Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> + +Upstream-Status: Backport [2.6.26] + +Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de> + +diff -Nurd linux-2.6.24.orig//include/asm-arm/hwcap.h linux-2.6.24/include/asm-arm/hwcap.h +--- linux-2.6.24.orig//include/asm-arm/hwcap.h 2011-09-15 08:42:58.467307245 +0200 ++++ linux-2.6.24/include/asm-arm/hwcap.h 2011-09-15 08:43:46.004693497 +0200 +@@ -15,6 +15,7 @@ + #define HWCAP_JAVA 256 + #define HWCAP_IWMMXT 512 + #define HWCAP_CRUNCH 1024 ++#define HWCAP_THUMBEE 2048 + + #if defined(__KERNEL__) && !defined(__ASSEMBLY__) + /* diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb index 148d03f..d7f67ed 100644 --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb @@ -2,13 +2,15 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r7" +PR = "r8" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://procinfo.h \ file://export_falloc_h.patch \ file://make-3.82.patch \ - file://unifdef.patch" + file://unifdef.patch \ + file://arm-hwcap-add-new-entries.patch \ +" SRC_URI_append_hipox = " \ file://siocoutqsnd.patch \
Enables building of OpenJDK which uses HWCAP_THUMBEE that is not present in 2.6.24 headers and was introduced with commit d7f864be8323e5394040e2877594645b0e7da85d Author: Catalin Marinas <catalin.marinas@arm.com> Date: Fri Apr 18 22:43:06 2008 +0100 ARMv7: Add support for the ThumbEE state saving/restoring This patch adds the detection and handling of the ThumbEE extension on ARMv7 CPUs. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Upstream-Status: Backport [2.6.26] Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> --- [PATCH v5] contains updates in commit comment and patch header as a result of Paul's review of [PATCH v4] especially the referenced linux commit. --- .../arm-hwcap-add-new-entries.patch | 31 ++++++++++++++++++++ .../linux-libc-headers_2.6.24.bb | 6 ++- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch