Skip to contentSkip to conversation

micropython: fix build for MIPS64 n32

PATCH Superseded Vicente Olivert Riera 4 participants 5 messages Sep 23, 2015

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 micropython: fix build for MIPS64 n32

This patch applies an upstream patch to fix a compile error like this one:

modffi.c: In function 'ffifunc_call':
modffi.c:358:25: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]

             values[i] = (ffi_arg)a;

This error can be highlighted when building micropython for MIPS64 n32 because ffi_arg is 64-bit wide and the pointers on MIPS64 n32 are 32-bit wide, so it's trying to case an integer to a pointer (or vice versa) of a different size. We should cast first the pointer (or the integer) to a pointer sized integer (intptr_t) to fix that problem.

This patch was merged upstream as a result of this pull request:

https://github.com/micropython/micropython/pull/1471

Fixes:

http://autobuild.buildroot.net/results/e22/e2253de3f96e9a53e75b4cecaf56c1df2950803f/

---
Changes v1 - > v2:
- Fixed a typo in the commit log: changed 'from' to 'for'
- Add the patch file to MICROPYTHON_PATCH using '+='. (Chris Packham)

 package/micropython/micropython.mk |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
package/micropython/micropython.mk +1 -0
index f2ad5bf..7f401bf 100644
@@ -10,6 +10,7 @@ MICROPYTHON_LICENSE = MIT
 MICROPYTHON_LICENSE_FILES = LICENSE
 MICROPYTHON_DEPENDENCIES = host-pkgconf libffi
 MICROPYTHON_PATCH = https://github.com/micropython/micropython/commit/8b4fb4fe140e9cf57fcfa258d0d2d6fe19090fc5.patch
+MICROPYTHON_PATCH += https://github.com/micropython/micropython/commit/587914169cc6ff7f0513bd14c42dcbb275bf77bd.patch
 
 # Use fallback implementation for exception handling on architectures that don't
 # have explicit support.
Signature · 1 line
1.7.1
#1 lore raw

PATCH v2 1/1 micropython: fix build for MIPS64 n32

Vicente,

package/micropython/micropython.mk MICROPYTHON_LICENSE = MIT · line 13

Quoted 9 lines · Vicente Olivert Riera
package/micropython/micropython.mk +1 -0
index f2ad5bf..7f401bf 100644
@@ -10,6 +10,7 @@ MICROPYTHON_LICENSE = MIT
 MICROPYTHON_LICENSE_FILES = LICENSE
 MICROPYTHON_DEPENDENCIES = host-pkgconf libffi
 MICROPYTHON_PATCH = https://github.com/micropython/micropython/commit/8b4fb4fe140e9cf57fcfa258d0d2d6fe19090fc5.patch
+MICROPYTHON_PATCH += https://github.com/micropython/micropython/commit/587914169cc6ff7f0513bd14c42dcbb275bf77bd.patch

There's no need to use a += here, using a single assignment for both is nicer. I've changed that and applied, thanks!

Thomas

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

PATCH v2 1/1 micropython: fix build for MIPS64 n32

Hi Thomas,

Quoted 4 lines · Thomas Petazzoni

Vicente,

On Wed, 23 Sep 2015 09:44:20 +0100, Vicente Olivert Riera wrote:

Quoted 12 lines

package/micropython/micropython.mk MICROPYTHON_LICENSE = MIT · line 13

Quoted 9 lines
package/micropython/micropython.mk +1 -0
index f2ad5bf..7f401bf 100644
@@ -10,6 +10,7 @@ MICROPYTHON_LICENSE = MIT
  MICROPYTHON_LICENSE_FILES = LICENSE
  MICROPYTHON_DEPENDENCIES = host-pkgconf libffi
  MICROPYTHON_PATCH = https://github.com/micropython/micropython/commit/8b4fb4fe140e9cf57fcfa258d0d2d6fe19090fc5.patch
+MICROPYTHON_PATCH += https://github.com/micropython/micropython/commit/587914169cc6ff7f0513bd14c42dcbb275bf77bd.patch

There's no need to use a += here, using a single assignment for both is nicer. I've changed that and applied, thanks!

Noted. I will do it in that way from now on :-)

Thanks!

Vincent.

Quoted 2 lines

Thomas

#3 lore raw

PATCH v2 1/1 micropython: fix build for MIPS64 n32

In reply to Vicente Olivert Riera
Quoted 18 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Vicente" == Vicente Olivert Riera <[email protected]> writes:

This patch applies an upstream patch to fix a compile error like this one:

modffi.c: In function 'ffifunc_call':
modffi.c:358:25: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]

             values[i] = (ffi_arg)a;

This error can be highlighted when building micropython for MIPS64 n32 because ffi_arg is 64-bit wide and the pointers on MIPS64 n32 are 32-bit wide, so it's trying to case an integer to a pointer (or vice versa) of a different size. We should cast first the pointer (or the integer) to a pointer sized integer (intptr_t) to fix that problem.

This patch was merged upstream as a result of this pull request:

Quoted 7 lines

https://github.com/micropython/micropython/pull/1471

Fixes:

http://autobuild.buildroot.net/results/e22/e2253de3f96e9a53e75b4cecaf56c1df2950803f/

Committed, thanks.

If we need to apply any more patches then I think it makes more sense to get the sources from git (or convince upstream to make a new release).

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH v2 1/1 micropython: fix build for MIPS64 n32

Hi Peter,

Quoted 22 lines · Peter Korsgaard
Quoted 21 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Vicente" == Vicente Olivert Riera <[email protected]> writes:

This patch applies an upstream patch to fix a compile error like this one:

modffi.c: In function 'ffifunc_call':
modffi.c:358:25: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]

             values[i] = (ffi_arg)a;

This error can be highlighted when building micropython for MIPS64 n32 because ffi_arg is 64-bit wide and the pointers on MIPS64 n32 are 32-bit wide, so it's trying to case an integer to a pointer (or vice versa) of a different size. We should cast first the pointer (or the integer) to a pointer sized integer (intptr_t) to fix that problem.

This patch was merged upstream as a result of this pull request:

https://github.com/micropython/micropython/pull/1471

Fixes:

Quoted 9 lines
Quoted 3 lines

http://autobuild.buildroot.net/results/e22/e2253de3f96e9a53e75b4cecaf56c1df2950803f/

Committed, thanks.

If we need to apply any more patches then I think it makes more sense to get the sources from git (or convince upstream to make a new release).

I think they heard you :) 1.4.6 was just released. I'll send a patch through for that shortly.