diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-12-01 11:15:54 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-12-01 11:16:42 +0100 |
| commit | fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb (patch) | |
| tree | fd6edbe93b19b167b105897e3de6a7c11eac4f9c /package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch | |
| parent | 9a5434fbfc98a0c427c880b167b8ca3499b44e87 (diff) | |
| parent | 9b47f40bb29d9be34afabfb423bab0ad45cbc11f (diff) | |
| download | buildroot-fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb.tar.gz buildroot-fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb.zip | |
Merge branch 'next'
Conflicts:
Makefile
package/flac/0001-fix-altivec-logic.patch
package/grantlee/Config.in
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch')
| -rw-r--r-- | package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch | 44 |
1 files changed, 16 insertions, 28 deletions
diff --git a/package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch b/package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch index 6aca13ced4..9ce64c92ef 100644 --- a/package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch +++ b/package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch @@ -1,16 +1,16 @@ Properly define the __NR_memfd_create macro for MIPS This is an upstream patch which has been applied to the master branch -and I have adapted it to make it apply to the v216 version. +and I have adapted it to make it apply to the v217 version. Upstream commit: http://cgit.freedesktop.org/systemd/systemd/commit/?id=e6c019026b8cfd27a997e6e6ed1349f8f289b7e2 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> -From cdd25569e583ccfff3aef0eda175a2d07c00f859 Mon Sep 17 00:00:00 2001 +From a51496db6edc8168268c86ea55915405f95b0212 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera <Vincent.Riera@imgtec.com> -Date: Tue, 4 Nov 2014 10:49:58 +0000 +Date: Thu, 13 Nov 2014 17:32:52 +0000 Subject: [PATCH] Properly define the __NR_memfd_create macro for MIPS This macro exists for MIPS since v3.17: @@ -18,43 +18,31 @@ This macro exists for MIPS since v3.17: Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> --- - src/shared/missing.h | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + src/shared/missing.h | 11 +++++++++-- + 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/shared/missing.h b/src/shared/missing.h -index 3ff1a21..6888163 100644 +index bb4f8f2..66bedcf 100644 --- a/src/shared/missing.h +++ b/src/shared/missing.h -@@ -152,6 +152,9 @@ static inline int pivot_root(const char *new_root, const char *put_old) { - # ifndef __NR_fanotify_mark - # define __NR_fanotify_mark 4337 - # endif -+# ifndef __NR_memfd_create +@@ -125,8 +125,15 @@ static inline int pivot_root(const char *new_root, const char *put_old) { + # endif + #elif defined _MIPS_SIM + # ifndef __NR_memfd_create +-# warning "__NR_memfd_create not yet defined for MIPS" +-# define __NR_memfd_create 0xffffffff ++# if _MIPS_SIM == _MIPS_SIM_ABI32 +# define __NR_memfd_create 4354 +# endif - # elif _MIPS_SIM == _MIPS_SIM_NABI32 - # ifndef __NR_fanotify_init - # define __NR_fanotify_init 6300 -@@ -159,6 +162,9 @@ static inline int pivot_root(const char *new_root, const char *put_old) { - # ifndef __NR_fanotify_mark - # define __NR_fanotify_mark 6301 - # endif -+# ifndef __NR_memfd_create ++# if _MIPS_SIM == _MIPS_SIM_NABI32 +# define __NR_memfd_create 6318 +# endif - # elif _MIPS_SIM == _MIPS_SIM_ABI64 - # ifndef __NR_fanotify_init - # define __NR_fanotify_init 5295 -@@ -166,6 +172,9 @@ static inline int pivot_root(const char *new_root, const char *put_old) { - # ifndef __NR_fanotify_mark - # define __NR_fanotify_mark 5296 - # endif -+# ifndef __NR_memfd_create ++# if _MIPS_SIM == _MIPS_SIM_ABI64 +# define __NR_memfd_create 5314 +# endif # endif #else - # ifndef __NR_fanotify_init + # ifndef __NR_memfd_create -- 1.7.1 |
