diff mbox

[API-NEXT] linux-generic: packet: fix 32-bit compile issue with odp_packet_align

Message ID 1461758716-9759-1-git-send-email-bill.fischofer@linaro.org
State Accepted
Commit 35a6b55e063e799c65476333d64901a89c4a25eb
Headers show

Commit Message

Bill Fischofer April 27, 2016, 12:05 p.m. UTC
Add additional cast to enable proper compilation on 32-bit systems.

Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org>
---
 platform/linux-generic/odp_packet.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Maxim Uvarov April 27, 2016, 1:47 p.m. UTC | #1
Merged,

that is strange because I have arm compilation on git pre-push hook and 
compile
everything one more time for arm. Bit it looks like our CI updated gcc 
which now
captures more errors than my gcc.

Maxim.

On 04/27/16 15:05, Bill Fischofer wrote:
> Add additional cast to enable proper compilation on 32-bit systems.
>
> Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org>
> ---
>   platform/linux-generic/odp_packet.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
> index 3651586..f1b9049 100644
> --- a/platform/linux-generic/odp_packet.c
> +++ b/platform/linux-generic/odp_packet.c
> @@ -681,7 +681,7 @@ int odp_packet_align(odp_packet_t *pkt, uint32_t offset, uint32_t len,
>   	uint32_t seglen = 0;  /* GCC */
>   	odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(*pkt);
>   	void *addr = packet_map(pkt_hdr, offset, &seglen);
> -	uint64_t uaddr = (uint64_t)addr;
> +	uint64_t uaddr = (uint64_t)(uintptr_t)addr;
>   	uint64_t misalign;
>   
>   	if (align > ODP_CACHE_LINE_SIZE)
Bill Fischofer April 27, 2016, 2:19 p.m. UTC | #2
On Wed, Apr 27, 2016 at 8:47 AM, Maxim Uvarov <maxim.uvarov@linaro.org>
wrote:

> Merged,

>

> that is strange because I have arm compilation on git pre-push hook and

> compile

> everything one more time for arm. Bit it looks like our CI updated gcc

> which now

> captures more errors than my gcc.

>


That is strange since the previous code compiled fine with clang and clang
is also a lot more nit-picky about this sort of stuff.  GCC flaged this
error when I compile with CFLAGS=-m32.  I'm using vanilla Ubuntu 15.10
which has gcc 5.2.1.


>

> Maxim.

>

> On 04/27/16 15:05, Bill Fischofer wrote:

>

>> Add additional cast to enable proper compilation on 32-bit systems.

>>

>> Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org>

>> ---

>>   platform/linux-generic/odp_packet.c | 2 +-

>>   1 file changed, 1 insertion(+), 1 deletion(-)

>>

>> diff --git a/platform/linux-generic/odp_packet.c

>> b/platform/linux-generic/odp_packet.c

>> index 3651586..f1b9049 100644

>> --- a/platform/linux-generic/odp_packet.c

>> +++ b/platform/linux-generic/odp_packet.c

>> @@ -681,7 +681,7 @@ int odp_packet_align(odp_packet_t *pkt, uint32_t

>> offset, uint32_t len,

>>         uint32_t seglen = 0;  /* GCC */

>>         odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(*pkt);

>>         void *addr = packet_map(pkt_hdr, offset, &seglen);

>> -       uint64_t uaddr = (uint64_t)addr;

>> +       uint64_t uaddr = (uint64_t)(uintptr_t)addr;

>>         uint64_t misalign;

>>         if (align > ODP_CACHE_LINE_SIZE)

>>

>

> _______________________________________________

> lng-odp mailing list

> lng-odp@lists.linaro.org

> https://lists.linaro.org/mailman/listinfo/lng-odp

>
diff mbox

Patch

diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 3651586..f1b9049 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -681,7 +681,7 @@  int odp_packet_align(odp_packet_t *pkt, uint32_t offset, uint32_t len,
 	uint32_t seglen = 0;  /* GCC */
 	odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(*pkt);
 	void *addr = packet_map(pkt_hdr, offset, &seglen);
-	uint64_t uaddr = (uint64_t)addr;
+	uint64_t uaddr = (uint64_t)(uintptr_t)addr;
 	uint64_t misalign;
 
 	if (align > ODP_CACHE_LINE_SIZE)