[oe,2/3] libhugetlbfs: Recognize all ix86 arches

Message ID 1415301783-5342-3-git-send-email-gary.robertson@linaro.org
State New
Headers show

Commit Message

gary.robertson@linaro.org Nov. 6, 2014, 7:23 p.m.
From: "Gary S. Robertson" <gary.robertson@linaro.org>

The makefile for libhugetlbfs recognized only i386 or x86_64 arch designators.
Extended this to also recognize i486, i586, and i686

Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
---
 ...01-libhugetlbfs-Recognize-all-ix86-arches.patch |   31 ++++++++++++++++++++
 .../libhugetlbfs/libhugetlbfs_git.bb               |    1 +
 2 files changed, 32 insertions(+)
 create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0001-libhugetlbfs-Recognize-all-ix86-arches.patch

Comments

gary.robertson@linaro.org Nov. 7, 2014, 1:38 a.m. | #1
As per the other patches sent in this series, please ignore for now...
looks like it may be better to update the version of libhugetlbfs used in
the recipe after these patches are accepted there.

On Thu, Nov 6, 2014 at 1:23 PM, Gary S. Robertson <gary.robertson@linaro.org
> wrote:

> From: "Gary S. Robertson" <gary.robertson@linaro.org>
>
> The makefile for libhugetlbfs recognized only i386 or x86_64 arch
> designators.
> Extended this to also recognize i486, i586, and i686
>
> Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
> ---
>  ...01-libhugetlbfs-Recognize-all-ix86-arches.patch |   31
> ++++++++++++++++++++
>  .../libhugetlbfs/libhugetlbfs_git.bb               |    1 +
>  2 files changed, 32 insertions(+)
>  create mode 100644
> meta-oe/recipes-benchmark/libhugetlbfs/files/0001-libhugetlbfs-Recognize-all-ix86-arches.patch
>
> diff --git
> a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-libhugetlbfs-Recognize-all-ix86-arches.patch
> b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-libhugetlbfs-Recognize-all-ix86-arches.patch
> new file mode 100644
> index 0000000..4eade89
> --- /dev/null
> +++
> b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-libhugetlbfs-Recognize-all-ix86-arches.patch
> @@ -0,0 +1,31 @@
> +From fcb166479d3ccd9b79fd07e89b1ed2d8899b4391 Mon Sep 17 00:00:00 2001
> +From: "Gary S. Robertson" <gary.robertson@linaro.org>
> +Date: Wed, 24 Sep 2014 15:27:31 -0500
> +Subject: [libhugetlbfs][PATCH] Recognize all ix86 arches
> +
> +The makefile only recognized i386 or x86_64 arches.  Added support
> +to recognize i486, i586, i686.
> +
> +Upstream Status: Submitted
> +
> +Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
> +---
> + Makefile |    2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Makefile b/Makefile
> +index 91502e1..0bfaee8 100644
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -71,7 +71,7 @@ ELF64 = aarch64elf
> + TMPLIB64 = lib64
> + CUSTOM_LDSCRIPTS = no
> + else
> +-ifeq ($(ARCH),i386)
> ++ifneq (,$(filter i386 i486 i586 i686,$(ARCH)))
> + CC32 = $(CC)
> + ELF32 = elf_i386
> + TMPLIB32 = lib
> +--
> +1.7.9.5
> +
> diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> index 737acb9..0af77f1 100644
> --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> @@ -19,6 +19,7 @@ SRC_URI = "git://git.code.sf.net/p/libhugetlbfs/code \
>      file://0001-aarch64-fix-page-size-not-properly-computed.patch \
>
>  file://0001-replace-lib-lib64-hardcoded-values-by-LIBDIR32-LIBDI.patch \
>      file://0001-Extend-arm32-support-to-include-BE-variants.patch \
> +    file://0001-libhugetlbfs-Recognize-all-ix86-arches.patch \
>  "
>
>  S = "${WORKDIR}/git"
> --
> 1.7.9.5
>
>

Patch

diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-libhugetlbfs-Recognize-all-ix86-arches.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-libhugetlbfs-Recognize-all-ix86-arches.patch
new file mode 100644
index 0000000..4eade89
--- /dev/null
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-libhugetlbfs-Recognize-all-ix86-arches.patch
@@ -0,0 +1,31 @@ 
+From fcb166479d3ccd9b79fd07e89b1ed2d8899b4391 Mon Sep 17 00:00:00 2001
+From: "Gary S. Robertson" <gary.robertson@linaro.org>
+Date: Wed, 24 Sep 2014 15:27:31 -0500
+Subject: [libhugetlbfs][PATCH] Recognize all ix86 arches
+
+The makefile only recognized i386 or x86_64 arches.  Added support
+to recognize i486, i586, i686.
+
+Upstream Status: Submitted
+
+Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 91502e1..0bfaee8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -71,7 +71,7 @@ ELF64 = aarch64elf
+ TMPLIB64 = lib64
+ CUSTOM_LDSCRIPTS = no
+ else
+-ifeq ($(ARCH),i386)
++ifneq (,$(filter i386 i486 i586 i686,$(ARCH)))
+ CC32 = $(CC)
+ ELF32 = elf_i386
+ TMPLIB32 = lib
+-- 
+1.7.9.5
+
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
index 737acb9..0af77f1 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
@@ -19,6 +19,7 @@  SRC_URI = "git://git.code.sf.net/p/libhugetlbfs/code \
     file://0001-aarch64-fix-page-size-not-properly-computed.patch \
     file://0001-replace-lib-lib64-hardcoded-values-by-LIBDIR32-LIBDI.patch \
     file://0001-Extend-arm32-support-to-include-BE-variants.patch \
+    file://0001-libhugetlbfs-Recognize-all-ix86-arches.patch \
 "
 
 S = "${WORKDIR}/git"