Skip to contentSkip to conversation

trinity: fix typo in MIPS' GET_FP_MODE and SET_FP_MODE macros

PATCH New Vicente Olivert Riera 2 participants 3 messages Dec 14, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 trinity: fix typo in MIPS' GET_FP_MODE and SET_FP_MODE macros

Add a patch to fix a typo in the syscalls/prctl.c file. The PR_GET_FP_MODE and PR_SET_FP_MODE macros are defined in include/compat.h, but then syscalls/prctl.c tries to use GET_FP_MODE and SET_FP_MODE. It's lacking the PR_ preffix, and this is causing build failures like this one:

CC syscalls/prctl.o
syscalls/prctl.c:37:2: error: 'GET_FP_MODE' undeclared here (not in a function)
GET_FP_MODE, SET_FP_MODE,
^
syscalls/prctl.c:37:15: error: 'SET_FP_MODE' undeclared here (not in a function)
GET_FP_MODE, SET_FP_MODE,

               ^

This patch has been sent upstream.

Fixes:
http://autobuild.buildroot.net/results/12f/12f3144b5d99aa1872f6073f3aaac7f8a9c5cfdc/

---
 package/trinity/0001-mips-fix-prctl-s.patch | 39 +++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 package/trinity/0001-mips-fix-prctl-s.patch
package/trinity/0001-mips-fix-prctl-s.patch new file +39 -0
new file mode 100644
index 0000000..aacd8d5
@@ -0,0 +1,39 @@
+From d61dd102b95b9791e45d6bbf1e34814b8c6c1731 Mon Sep 17 00:00:00 2001
+From: Vicente Olivert Riera <[email protected]>
+Date: Mon, 14 Dec 2015 14:46:37 +0000
+Subject: [PATCH] mips: fix prctl's
+
+It looks like a typo in the syscalls/prctl.c file. It's lacking the PR_
+preffix, and due to that is causing build failures like this one:
+
+  CC	syscalls/prctl.o
+syscalls/prctl.c:37:2: error: 'GET_FP_MODE' undeclared here (not in a
+function)
+  GET_FP_MODE, SET_FP_MODE,
+  ^
+syscalls/prctl.c:37:15: error: 'SET_FP_MODE' undeclared here (not
+in a function)
+  GET_FP_MODE, SET_FP_MODE,
+               ^
+
+Signed-off-by: Vicente Olivert Riera <[email protected]>
+---
+ syscalls/prctl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/syscalls/prctl.c b/syscalls/prctl.c
+index 523f03e..5a64fb3 100644
+--- a/syscalls/prctl.c
++++ b/syscalls/prctl.c
+@@ -34,7 +34,7 @@ static int prctl_opts[] = {
+ 	PR_GET_NO_NEW_PRIVS, PR_GET_TID_ADDRESS, PR_SET_THP_DISABLE, PR_GET_THP_DISABLE,
+ 	PR_MPX_ENABLE_MANAGEMENT, PR_MPX_DISABLE_MANAGEMENT,
+ #ifdef __mips__
+-	GET_FP_MODE, SET_FP_MODE,
++	PR_GET_FP_MODE, PR_SET_FP_MODE,
+ #endif
+ 	PR_CAP_AMBIENT,
+ };
+-- 
+2.4.10
+
Signature · 1 line
2.4.10
#1 lore raw

PATCH 2/2 trinity: add a hash file

---
 package/trinity/trinity.hash | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 package/trinity/trinity.hash
package/trinity/trinity.hash new file +2 -0
new file mode 100644
index 0000000..e290a40
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 3ef7ae05dba14f8bb626121983a08bb09d1d51a19de38bd9a8e0f29b11d9e3c9  trinity-v1.6.tar.gz
Signature · 1 line
2.4.10
#2 lore raw

PATCH 1/2 trinity: fix typo in MIPS' GET_FP_MODE and SET_FP_MODE macros

In reply to Vicente Olivert Riera

Dear Vicente Olivert Riera,

Quoted 18 lines · Vicente Olivert Riera

Add a patch to fix a typo in the syscalls/prctl.c file. The PR_GET_FP_MODE and PR_SET_FP_MODE macros are defined in include/compat.h, but then syscalls/prctl.c tries to use GET_FP_MODE and SET_FP_MODE. It's lacking the PR_ preffix, and this is causing build failures like this one:

CC syscalls/prctl.o
syscalls/prctl.c:37:2: error: 'GET_FP_MODE' undeclared here (not in a function)
GET_FP_MODE, SET_FP_MODE,
^
syscalls/prctl.c:37:15: error: 'SET_FP_MODE' undeclared here (not in a function)
GET_FP_MODE, SET_FP_MODE,

               ^

This patch has been sent upstream.

Quoted 8 lines

Fixes:
http://autobuild.buildroot.net/results/12f/12f3144b5d99aa1872f6073f3aaac7f8a9c5cfdc/

---
 package/trinity/0001-mips-fix-prctl-s.patch | 39 +++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 package/trinity/0001-mips-fix-prctl-s.patch

Both applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com