* [PATCH 1/2] libhugetlbfs: avoid search host library path for cross compilation
@ 2015-08-26 1:25 kai.kang
2015-08-26 1:25 ` [PATCH 2/2] libhugetlbfs: avoid using keyword restrict as var name kai.kang
2015-08-26 1:31 ` [PATCH 1/2] libhugetlbfs: avoid search host library path for cross compilation Kang Kai
0 siblings, 2 replies; 3+ messages in thread
From: kai.kang @ 2015-08-26 1:25 UTC (permalink / raw)
To: openembedded-devel
From: Kai Kang <kai.kang@windriver.com>
There was a patch fixing the same issue:
libhugetlbfs-avoid-search-host-library-path-for-cros.patch
but missed the elf_i386.xB*, this patch fixes for it.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
...s-elf_i386-avoid-search-host-library-path.patch | 40 ++++++++++++++++++++++
.../libhugetlbfs/libhugetlbfs_git.bb | 1 +
2 files changed, 41 insertions(+)
create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
new file mode 100644
index 0000000..1566488
--- /dev/null
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
@@ -0,0 +1,40 @@
+From 889e52753d30179ba4ac940023cb4ed561436ab8 Mon Sep 17 00:00:00 2001
+From: Jackie Huang <jackie.huang@windriver.com>
+Date: Tue, 4 Nov 2014 00:49:11 -0800
+Subject: [PATCH] libhugetlbfs/elf_i386: avoid search host library path for cross compilation
+
+Upstream-Status: Inappropriate [cross compile specific]
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ ldscripts/elf_i386.xB | 1 -
+ ldscripts/elf_i386.xBDT | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/ldscripts/elf_i386.xB b/ldscripts/elf_i386.xB
+index 43fe51c..eae0fa8 100644
+--- a/ldscripts/elf_i386.xB
++++ b/ldscripts/elf_i386.xB
+@@ -3,7 +3,6 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386",
+ "elf32-i386")
+ OUTPUT_ARCH(i386)
+ ENTRY(_start)
+-SEARCH_DIR("/usr/i486-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
+ INPUT(-lhugetlbfs);
+ /* Do we need any of these for elf?
+ __DYNAMIC = 0; */
+diff --git a/ldscripts/elf_i386.xBDT b/ldscripts/elf_i386.xBDT
+index d72aebe..3bac1b1 100644
+--- a/ldscripts/elf_i386.xBDT
++++ b/ldscripts/elf_i386.xBDT
+@@ -3,7 +3,6 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386",
+ "elf32-i386")
+ OUTPUT_ARCH(i386)
+ ENTRY(_start)
+-SEARCH_DIR("/usr/i486-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
+ INPUT(-lhugetlbfs);
+ /* Do we need any of these for elf?
+ __DYNAMIC = 0; */
+--
+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 a2d3922..ae5e46a 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
@@ -17,6 +17,7 @@ SRC_URI = " \
file://libhugetlbfs-avoid-search-host-library-path-for-cros.patch \
file://tests-Makefile-install-static-4G-edge-testcases.patch \
file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \
+ file://libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \
"
S = "${WORKDIR}/git"
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] libhugetlbfs: avoid using keyword restrict as var name
2015-08-26 1:25 [PATCH 1/2] libhugetlbfs: avoid search host library path for cross compilation kai.kang
@ 2015-08-26 1:25 ` kai.kang
2015-08-26 1:31 ` [PATCH 1/2] libhugetlbfs: avoid search host library path for cross compilation Kang Kai
1 sibling, 0 replies; 3+ messages in thread
From: kai.kang @ 2015-08-26 1:25 UTC (permalink / raw)
To: openembedded-devel
From: Kai Kang <kai.kang@windriver.com>
When compile with gcc 5.x, libhugetlbfs fails with:
| hugeutils.c: In function '__lh_hugetlbfs_setup_env':
| hugeutils.c:304:40: error: expected identifier or '(' before restrict'
| char *p, *tok, *exe, buf[MAX_EXE+1], restrict[MAX_EXE];
| ^
Rename variable to avoid using keyword restrict as variable name to fix it.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
...ugetlbfs-avoid-using-restrict-as-var-name.patch | 34 ++++++++++++++++++++++
.../libhugetlbfs/libhugetlbfs_git.bb | 1 +
2 files changed, 35 insertions(+)
create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-using-restrict-as-var-name.patch
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-using-restrict-as-var-name.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-using-restrict-as-var-name.patch
new file mode 100644
index 0000000..b77cfe1
--- /dev/null
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-using-restrict-as-var-name.patch
@@ -0,0 +1,34 @@
+Avoid using keyword restrict as variable name which causes error with gcc 5.x:
+
+| hugeutils.c: In function '__lh_hugetlbfs_setup_env':
+| hugeutils.c:304:40: error: expected identifier or '(' before 'restrict'
+| char *p, *tok, *exe, buf[MAX_EXE+1], restrict[MAX_EXE];
+| ^
+
+Upstream-Status: Pending
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+diff --git a/hugeutils.c b/hugeutils.c
+index 53a7fbd..b9d7001 100644
+--- a/hugeutils.c
++++ b/hugeutils.c
+@@ -301,14 +301,14 @@ void hugetlbfs_setup_env()
+
+ env = getenv("HUGETLB_RESTRICT_EXE");
+ if (env) {
+- char *p, *tok, *exe, buf[MAX_EXE+1], restrict[MAX_EXE];
++ char *p, *tok, *exe, buf[MAX_EXE+1], restricted[MAX_EXE];
+ int found = 0;
+
+ exe = get_exe_name(buf, sizeof buf);
+ DEBUG("Found HUGETLB_RESTRICT_EXE, this exe is \"%s\"\n", exe);
+- strncpy(restrict, env, sizeof restrict);
+- restrict[sizeof(restrict)-1] = 0;
+- for (p = restrict; (tok = strtok(p, ":")) != NULL; p = NULL) {
++ strncpy(restricted, env, sizeof restricted);
++ restricted[sizeof(restricted)-1] = 0;
++ for (p = restricted; (tok = strtok(p, ":")) != NULL; p = NULL) {
+ DEBUG(" ...check exe match for \"%s\"\n", tok);
+ if (strcmp(tok, exe) == 0) {
+ found = 1;
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
index ae5e46a..b7cc416 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
@@ -18,6 +18,7 @@ SRC_URI = " \
file://tests-Makefile-install-static-4G-edge-testcases.patch \
file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \
file://libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \
+ file://libhugetlbfs-avoid-using-restrict-as-var-name.patch \
"
S = "${WORKDIR}/git"
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] libhugetlbfs: avoid search host library path for cross compilation
2015-08-26 1:25 [PATCH 1/2] libhugetlbfs: avoid search host library path for cross compilation kai.kang
2015-08-26 1:25 ` [PATCH 2/2] libhugetlbfs: avoid using keyword restrict as var name kai.kang
@ 2015-08-26 1:31 ` Kang Kai
1 sibling, 0 replies; 3+ messages in thread
From: Kang Kai @ 2015-08-26 1:31 UTC (permalink / raw)
To: openembedded-devel
Forgot to add layer info. They are for layer meta-oe.
--Kai
On 2015年08月26日 09:25, kai.kang@windriver.com wrote:
> From: Kai Kang <kai.kang@windriver.com>
>
> There was a patch fixing the same issue:
> libhugetlbfs-avoid-search-host-library-path-for-cros.patch
>
> but missed the elf_i386.xB*, this patch fixes for it.
>
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
> ...s-elf_i386-avoid-search-host-library-path.patch | 40 ++++++++++++++++++++++
> .../libhugetlbfs/libhugetlbfs_git.bb | 1 +
> 2 files changed, 41 insertions(+)
> create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
>
> diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
> new file mode 100644
> index 0000000..1566488
> --- /dev/null
> +++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
> @@ -0,0 +1,40 @@
> +From 889e52753d30179ba4ac940023cb4ed561436ab8 Mon Sep 17 00:00:00 2001
> +From: Jackie Huang <jackie.huang@windriver.com>
> +Date: Tue, 4 Nov 2014 00:49:11 -0800
> +Subject: [PATCH] libhugetlbfs/elf_i386: avoid search host library path for cross compilation
> +
> +Upstream-Status: Inappropriate [cross compile specific]
> +
> +Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> +---
> + ldscripts/elf_i386.xB | 1 -
> + ldscripts/elf_i386.xBDT | 1 -
> + 2 files changed, 2 deletions(-)
> +
> +diff --git a/ldscripts/elf_i386.xB b/ldscripts/elf_i386.xB
> +index 43fe51c..eae0fa8 100644
> +--- a/ldscripts/elf_i386.xB
> ++++ b/ldscripts/elf_i386.xB
> +@@ -3,7 +3,6 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386",
> + "elf32-i386")
> + OUTPUT_ARCH(i386)
> + ENTRY(_start)
> +-SEARCH_DIR("/usr/i486-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
> + INPUT(-lhugetlbfs);
> + /* Do we need any of these for elf?
> + __DYNAMIC = 0; */
> +diff --git a/ldscripts/elf_i386.xBDT b/ldscripts/elf_i386.xBDT
> +index d72aebe..3bac1b1 100644
> +--- a/ldscripts/elf_i386.xBDT
> ++++ b/ldscripts/elf_i386.xBDT
> +@@ -3,7 +3,6 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386",
> + "elf32-i386")
> + OUTPUT_ARCH(i386)
> + ENTRY(_start)
> +-SEARCH_DIR("/usr/i486-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
> + INPUT(-lhugetlbfs);
> + /* Do we need any of these for elf?
> + __DYNAMIC = 0; */
> +--
> +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 a2d3922..ae5e46a 100644
> --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> @@ -17,6 +17,7 @@ SRC_URI = " \
> file://libhugetlbfs-avoid-search-host-library-path-for-cros.patch \
> file://tests-Makefile-install-static-4G-edge-testcases.patch \
> file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \
> + file://libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \
> "
>
> S = "${WORKDIR}/git"
--
Regards,
Neil | Kai Kang
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-08-26 1:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-26 1:25 [PATCH 1/2] libhugetlbfs: avoid search host library path for cross compilation kai.kang
2015-08-26 1:25 ` [PATCH 2/2] libhugetlbfs: avoid using keyword restrict as var name kai.kang
2015-08-26 1:31 ` [PATCH 1/2] libhugetlbfs: avoid search host library path for cross compilation Kang Kai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.