mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-17 04:37:19 +00:00
Code Issues Projects Releases Wiki Activity

libhugetlbfs: avoid using keyword restrict as var name

Browse Source 
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>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Kai Kang
2015-08-26 09:25:25 +08:00
committed by Martin Jansa
parent 8023363d82
commit 3a92cd036c
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-using-restrict-as-var-name.patch
+34
View File
@@ -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;
meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+1
View File
@@ -18,6 +18,7 @@ SRC_URI = " \
file://tests-Makefile-install-static-4G-edge-testcases.patch \ file://tests-Makefile-install-static-4G-edge-testcases.patch \
file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.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-elf_i386-avoid-search-host-library-path.patch \
file://libhugetlbfs-avoid-using-restrict-as-var-name.patch \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"