Syslinux - Aug 2012 - [PATCH] fix isohybrid.c compile

Make isohybrid.c compile on gcc 4.4 32 bit

Signed-off-by: Frediano Ziglio <frediano.ziglio at citrix.com>
---
 utils/isohybrid.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/utils/isohybrid.c b/utils/isohybrid.c
index ac04bfd..e1e94c4 100644
--- a/utils/isohybrid.c
+++ b/utils/isohybrid.c
@@ -434,10 +434,10 @@ lendian_64(const uint64_t s)
        if (*(uint8_t *)&r)
                return s;

-       r = (s & 0x00000000000000FF) << 56 | (s &
0xFF00000000000000) >> 56
-            | (s & 0x000000000000FF00) << 40 | (s &
0x00FF000000000000) >> 40
-            | (s & 0x0000000000FF0000) << 24 | (s &
0x0000FF0000000000) >> 24
-            | (s & 0x00000000FF000000) << 8 | (s &
0x000000FF00000000) >> 8;
+       r = (s & 0x00000000000000FFull) << 56 | (s &
0xFF00000000000000ull) >> 56
+            | (s & 0x000000000000FF00ull) << 40 | (s &
0x00FF000000000000ull) >> 40
+            | (s & 0x0000000000FF0000ull) << 24 | (s &
0x0000FF0000000000ull) >> 24
+            | (s & 0x00000000FF000000ull) << 8 | (s &
0x000000FF00000000ull) >> 8;

        return r;
 }
@@ -759,7 +759,7 @@ initialise_gpt(uint8_t *gpt, uint32_t current, uint32_t
alternate, int primary)
        reverse_uuid(disk_uuid);
     }

-    header->signature = lendian_64(0x5452415020494645);
+    header->signature = lendian_64(0x5452415020494645ull);
     header->revision = lendian_int(0x010000);
     header->headerSize = lendian_int(0x5c);
     header->currentLBA = lendian_64(current);
-- 
1.7.5.4

On Fri, 2012-08-31 at 12:00 +0100, Frediano Ziglio
wrote:
> Make isohybrid.c compile on gcc 4.4 32 bit
> 
> Signed-off-by: Frediano Ziglio <frediano.ziglio at citrix.com>
> ---
>  utils/isohybrid.c |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)
Could you please resubmit this patch and include the warnings that gcc
emits in your commit log?

-- 
Matt Fleming, Intel Open Source Technology Center

On 2012-10-09 15:32, Matt Fleming wrote:
> On Fri, 2012-08-31 at 12:00 +0100, Frediano Ziglio wrote:
>> Make isohybrid.c compile on gcc 4.4 32 bit
>>
>> Signed-off-by: Frediano Ziglio <frediano.ziglio at citrix.com>
>> ---
>>  utils/isohybrid.c |   10 +++++-----
>>  1 files changed, 5 insertions(+), 5 deletions(-)
>
> Could you please resubmit this patch and include the warnings that gcc
> emits in your commit log?
>
These are warnings such as:

isohybrid.c: In function ?lendian_64?:
isohybrid.c:437: error: integer constant is too large for ?long? type

I had similar patch subimitted here:
http://www.syslinux.org/archives/2012-February/017297.html

and as part of
http://www.syslinux.org/archives/2012-August/017882.html

(now that I realized, I frogot -u there ...)