diff mbox

micropython: Add upstream patch to fix 64-bit builds

Message ID 1442738675-5141-1-git-send-email-judge.packham@gmail.com
State Accepted
Headers show

Commit Message

Chris Packham Sept. 20, 2015, 8:44 a.m. UTC
Fixes the following error when building for a 64-bit target

  ../py/objint_mpz.c:54:5: error: right shift count >= width of type [-Werror]
       (MP_SSIZE_MAX >> MPZ_DIG_SIZE * 4) & DIG_MASK,
       ^
  ../py/objint_mpz.c:54:5: error: initializer element is not constant
  ../py/objint_mpz.c:54:5: error: (near initialization for 'maxsize_dig[4]')

Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
So this is the upstream patch that fixes the build problem and replaces
http://lists.busybox.net/pipermail/buildroot/2015-September/139826.html

 package/micropython/micropython.mk | 1 +
 1 file changed, 1 insertion(+)

Comments

Vicente Olivert Riera Sept. 20, 2015, 9:34 a.m. UTC | #1
Dear Chris Packham,

On 20/09/15 09:44, Chris Packham wrote:
> Fixes the following error when building for a 64-bit target
> 
>    ../py/objint_mpz.c:54:5: error: right shift count >= width of type [-Werror]
>         (MP_SSIZE_MAX >> MPZ_DIG_SIZE * 4) & DIG_MASK,
>         ^
>    ../py/objint_mpz.c:54:5: error: initializer element is not constant
>    ../py/objint_mpz.c:54:5: error: (near initialization for 'maxsize_dig[4]')
> 
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

I have built micropython for MIPS32, MIPS64 n32* and MIPS64 n64. All fine.

*: after applying this patch:

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

Regards,

Vincent.

> ---
> So this is the upstream patch that fixes the build problem and replaces
> http://lists.busybox.net/pipermail/buildroot/2015-September/139826.html
> 
>   package/micropython/micropython.mk | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk
> index 6266882..f2ad5bf 100644
> --- a/package/micropython/micropython.mk
> +++ b/package/micropython/micropython.mk
> @@ -9,6 +9,7 @@ MICROPYTHON_SITE = $(call github,micropython,micropython,$(MICROPYTHON_VERSION))
>   MICROPYTHON_LICENSE = MIT
>   MICROPYTHON_LICENSE_FILES = LICENSE
>   MICROPYTHON_DEPENDENCIES = host-pkgconf libffi
> +MICROPYTHON_PATCH = https://github.com/micropython/micropython/commit/8b4fb4fe140e9cf57fcfa258d0d2d6fe19090fc5.patch
>   
>   # Use fallback implementation for exception handling on architectures that don't
>   # have explicit support.
>
Thomas Petazzoni Sept. 20, 2015, 12:28 p.m. UTC | #2
Dear Chris Packham,

On Sun, 20 Sep 2015 20:44:35 +1200, Chris Packham wrote:
> Fixes the following error when building for a 64-bit target
> 
>   ../py/objint_mpz.c:54:5: error: right shift count >= width of type [-Werror]
>        (MP_SSIZE_MAX >> MPZ_DIG_SIZE * 4) & DIG_MASK,
>        ^
>   ../py/objint_mpz.c:54:5: error: initializer element is not constant
>   ../py/objint_mpz.c:54:5: error: (near initialization for 'maxsize_dig[4]')
> 
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
> ---
> So this is the upstream patch that fixes the build problem and replaces
> http://lists.busybox.net/pipermail/buildroot/2015-September/139826.html

Applied, thanks.

Thomas
diff mbox

Patch

diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk
index 6266882..f2ad5bf 100644
--- a/package/micropython/micropython.mk
+++ b/package/micropython/micropython.mk
@@ -9,6 +9,7 @@  MICROPYTHON_SITE = $(call github,micropython,micropython,$(MICROPYTHON_VERSION))
 MICROPYTHON_LICENSE = MIT
 MICROPYTHON_LICENSE_FILES = LICENSE
 MICROPYTHON_DEPENDENCIES = host-pkgconf libffi
+MICROPYTHON_PATCH = https://github.com/micropython/micropython/commit/8b4fb4fe140e9cf57fcfa258d0d2d6fe19090fc5.patch
 
 # Use fallback implementation for exception handling on architectures that don't
 # have explicit support.