From: Adrian Bunk <bunk@stusta.de>
To: Khem Raj <raj.khem@gmail.com>
Cc: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-oe][PATCH 2/2] openocd: Fix build on x86_64
Date: Tue, 21 May 2019 10:19:28 +0300 [thread overview]
Message-ID: <20190521071928.GA15108@localhost> (raw)
In-Reply-To: <20190521065529.41647-2-raj.khem@gmail.com>
On Mon, May 20, 2019 at 11:55:29PM -0700, Khem Raj wrote:
>...
> +Fixes
> +| src/flash/nor/esirisc_flash.c:95:9: error: 'PAGE_SIZE' macro redefined [-Werror,-Wmacro-redefined]
> +| #define PAGE_SIZE 4096
> +| ^
> +| /mnt/a/yoe/build/tmp/work/core2-64-yoe-linux-musl/openocd/0.10+gitrAUTOINC+7ee618692f-r0/recipe-sysroot/usr/inclu
> +de/limits.h:89:9: note: previous definition is here
> +| #define PAGE_SIZE PAGESIZE
>...
> +--- a/src/flash/nor/esirisc_flash.c
> ++++ b/src/flash/nor/esirisc_flash.c
> +@@ -92,7 +92,9 @@
> + #endif
> +
> + #define CONTROL_TIMEOUT 5000 /* 5s */
> ++#ifndef PAGE_SIZE
> + #define PAGE_SIZE 4096
> ++#endif
> + #define PB_MAX 32
>...
Are you sure this is correct?
This looks like two completely unrelated defines that just happen to
have the same name.
And it worked by chance since they have the same value on x86_64.
Renaming to something like ESIRISC_PAGE_SIZE would be a proper fix.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
next prev parent reply other threads:[~2019-05-21 7:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-21 6:55 [meta-oe][PATCH V2 1/2] libnfc: Fix build with musl Khem Raj
2019-05-21 6:55 ` [meta-oe][PATCH 2/2] openocd: Fix build on x86_64 Khem Raj
2019-05-21 7:19 ` Adrian Bunk [this message]
2019-05-21 17:42 ` Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190521071928.GA15108@localhost \
--to=bunk@stusta.de \
--cc=openembedded-devel@lists.openembedded.org \
--cc=raj.khem@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.