From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rw03K-0001eU-Az for mharc-grub-devel@gnu.org; Fri, 10 Feb 2012 18:38:54 -0500 Received: from eggs.gnu.org ([140.186.70.92]:58532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rw03F-0001bn-Cp for grub-devel@gnu.org; Fri, 10 Feb 2012 18:38:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rw03D-0005qY-1C for grub-devel@gnu.org; Fri, 10 Feb 2012 18:38:49 -0500 Received: from mail-wi0-f169.google.com ([209.85.212.169]:40661) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rw03C-0005qF-MN for grub-devel@gnu.org; Fri, 10 Feb 2012 18:38:46 -0500 Received: by wibhj13 with SMTP id hj13so3013040wib.0 for ; Fri, 10 Feb 2012 15:38:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type; bh=YWK5wU7J85KPbIQo6NMBPxYwHHOUy5xyP9YJTUsX/5I=; b=oEIspMWzfOYRugU200PK601qSaQ7WQFBfZEdzyU8r0RRfJWVzdtHWgJGUJmUOrb1SM L0dPjpwbnnx7HFOKccJIFr+U07cxjeK+1Q9pJUsHW9jK1GlEN2pZpN2m/9DMoKXlG+fl 3sCO0CdSbqo4VBuFkTvAPYaSQ0pmdlspJpSao= Received: by 10.180.81.66 with SMTP id y2mr12077469wix.20.1328917125286; Fri, 10 Feb 2012 15:38:45 -0800 (PST) Received: from debian.x201.phnet (93-93.203-62.cust.bluewin.ch. [62.203.93.93]) by mx.google.com with ESMTPS id q7sm6350031wix.5.2012.02.10.15.38.42 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 10 Feb 2012 15:38:44 -0800 (PST) Message-ID: <4F35AA81.4010706@gmail.com> Date: Sat, 11 Feb 2012 00:38:41 +0100 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:8.0) Gecko/20120104 Icedove/8.0 MIME-Version: 1.0 To: Lennart Sorensen Subject: Re: Various build failures in current bzr tree References: <20120210154531.GA27742@caffeine.csclub.uwaterloo.ca> <4F353FA2.7070504@gmail.com> <20120210181523.GC27742@caffeine.csclub.uwaterloo.ca> <4F3568D1.5020304@gmail.com> <20120210190852.GH27742@caffeine.csclub.uwaterloo.ca> <20120210191421.GJ27742@caffeine.csclub.uwaterloo.ca> <4F356F2C.1000308@gmail.com> <20120210202507.GK27742@caffeine.csclub.uwaterloo.ca> <4F358041.5090600@gmail.com> <20120210204301.GN27742@caffeine.csclub.uwaterloo.ca> <20120210231425.GO27742@caffeine.csclub.uwaterloo.ca> In-Reply-To: <20120210231425.GO27742@caffeine.csclub.uwaterloo.ca> Content-Type: multipart/mixed; boundary="------------000702030208050704090605" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.212.169 Cc: The development of GNU GRUB X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2012 23:38:51 -0000 This is a multi-part message in MIME format. --------------000702030208050704090605 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable On 11.02.2012 00:14, Lennart Sorensen wrote: > On Fri, Feb 10, 2012 at 03:43:01PM -0500, Lennart Sorensen wrote: >> On Fri, Feb 10, 2012 at 09:38:25PM +0100, Vladimir '=CF=86-coder/phcod= er' Serbinenko wrote: >>> On 10.02.2012 21:25, Lennart Sorensen wrote: >>>> On Fri, Feb 10, 2012 at 08:25:32PM +0100, Vladimir '=CF=86-coder/phc= oder' Serbinenko wrote: >>>>> On 10.02.2012 20:14, Lennart Sorensen wrote: >>>>>> On Fri, Feb 10, 2012 at 02:08:52PM -0500, Lennart Sorensen wrote: >>>>>>> On Fri, Feb 10, 2012 at 07:58:25PM +0100, Vladimir '=CF=86-coder/= phcoder' Serbinenko wrote: >>>>>>>> On 10.02.2012 19:15, Lennart Sorensen wrote: >>>>>>>>> Where should grub_arch_dl_get_tramp_got_size come from? The li= nker >>>>>>>>> whines about it. >>>>>>>> It's in grub-core/kern/powerpc/dl.c >>>>>>>> I have no trouble to cross-compile ppc port on my amd64 machine.= >>>>>>> I will get the exact error again once I get the new code to stop = whining >>>>>>> so much. :) >>>>>>> >>>>>>> Or I can put the defined(__powerpc__) back in the older code and = try >>>>>>> that again. >>>>>> OK I did that: >>>>> Oh, it's powerpc-emu. That changes everything. >>>> Well I am using the debian package rules which build both emu and >>>> ieee1275. >>>> >>>> I am not using emu, but I am building it. Building doesn't take lon= g >>>> on a p710 after all. >>>> >>> >>> --=20 >>> Regards >>> Vladimir '=CF=86-coder/phcoder' Serbinenko >>> >>> =3D=3D=3D modified file 'grub-core/kern/emu/full.c' >>> --- grub-core/kern/emu/full.c 2012-02-09 22:15:27 +0000 >>> +++ grub-core/kern/emu/full.c 2012-02-10 20:37:43 +0000 >>> @@ -50,7 +50,7 @@ >>> grub_no_autoload =3D 1; >>> } >>> >>> -#ifdef __ia64__ >>> +#if defined (__ia64__) || defined (__powerpc__) >>> void grub_arch_dl_get_tramp_got_size (const void *ehdr __attribute_= _ ((unused)), >>> grub_size_t *tramp, grub_size_t *got) >>> { >>> >> That appears to fix the linker error on powerpc-emu builds. Yay! > OK I did a build with --disable-werror and captured the output using > gcc 4.5 rather than 4.4 this time, just to see if it made any differenc= e. > > It failed though with: > > cat kernel_syms.lst> syminfo.lst.new > for m in trig.module = = regexp.module blocklist.module = boot.module cat.module cmp.module = configfile.module date.module e= cho.module extcmd.module gptsync.module = halt.module reboot.module hashsum.module = help.module hexdump.module ke= ystatus.module loadenv.module ls.module = lsmmap.module memrw.module mini= cmd.module parttool.module password.module = password_pbkdf2.module probe.module = read.module search.module search_fs_file.m= odule search_fs_uuid.module search_label.module= sleep.module terminal.module = test.module true.module videoinfo= =2Emodule videotest.module xnu_uuid.module = dm_nv.module loopback.module cryptodis= k.module luks.module geli.module l= vm.module ldm.module mdraid09.module = mdraid1x.module diskfilter.module raid5rec.m= odule raid6rec.module scsi.module = memdisk.module font.= module affs.module afs.module bfs.mo= dule btrfs.module cpio.module cpio= _be.module newc.module odc.module = ext2.module fat.module exfat.module = fshelp.module hfs.module hfsplus.module = iso9660.module jfs.module minix.module = minix2.module minix3.module nilfs2= =2Emodule ntfs.module ntfscomp.module = reiserfs.module romfs.module sfs.module = squash4.module tar.module udf.module = ufs1.module ufs2.module xfs.module= zfs.module zfscrypt.module zfsinf= o.module gettext.module gfxmenu.module = hello.module gzio.module bufio.module = elf.module crypto.module pbkdf2.module = setjmp.module = normal.module= part_acorn.module part_amiga.module = part_apple.module part_gpt.module part_msdos= =2Emodule part_sun.module part_plan.module = part_dvh.module part_bsd.module part_s= unpc.module msdospart.module gfxterm.mod= ule terminfo.module = functional_test.module example_functional_test.module = bitmap.module bitmap_scale.module jpeg= =2Emodule png.module tga.module = video_fb.module video.module sdl.module datehook.= module net.module tftp.module http= =2Emodule emunet.module legacycfg.module test_blockar= g.module xzio.module lzopio.module = testload.module keylayouts.module priority_queu= e.module time.module adler32.modu= le crc64.module gcry_rmd160.module = gcry_sha1.module gcry_sha256.module gcry_whirl= pool.module gcry_tiger.module gcry_twofish.modu= le gcry_blowfish.module gcry_crc.module = gcry_rfc2268.module gcry_serpent.module g= cry_arcfour.module gcry_cast5.module gcry_md4.m= odule gcry_camellia.module gcry_des.module = gcry_seed.module gcry_rijndael.module = gcry_md5.module gcry_sha512.module ; do \ > sh gensyminfo.sh $m>> syminfo.lst.new || exit 1; \ > done > mv syminfo.lst.new syminfo.lst > cat syminfo.lst | sort | awk -f ../../../grub-core/genmoddep.awk> modd= ep.lst || (rm -f moddep.lst; exit 1) > make[4]: *** [moddep.lst] Error 1 > make[4]: Leaving directory `/root/grub2-1.99+20120210/build/grub-emu/gr= ub-core' > make[3]: *** [all-recursive] Error 1 > > I looked at it a bit and see: > > root@rceng03new:~/grub2-1.99+20120210/build/grub-emu/grub-core# cat sym= info.lst | sort | awk -f ../../../grub-core/genmoddep.awk > error: 1: unrecognized input format > > root@rceng03new:~/grub2-1.99+20120210/build/grub-emu/grub-core# cat sym= info.lst | sort | head > defined adler32 _gcry_digest_spec_adler32 > defined adler32 grub_adler32_fini > defined adler32 grub_adler32_init > defined affs grub_affs_fini > defined affs grub_affs_init > defined afs grub_afs_fini > defined afs grub_afs_init > defined bfs grub_bfs_fini > defined bfs grub_bfs_init > defined bitmap grub_bitmap_fini > > Anyhow, I am attaching the buildlog for as far as it got so you can see= > which warnings remain (all of which of course would have aborted the > build with -Werror). About 1500 warning: lines in the log at the momen= t. > --=20 Regards Vladimir '=CF=86-coder/phcoder' Serbinenko --------------000702030208050704090605 Content-Type: text/x-diff; name="1.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="1.diff" =3D=3D=3D modified file 'configure.ac' --- configure.ac 2012-02-10 15:48:48 +0000 +++ configure.ac 2012-02-10 23:28:12 +0000 @@ -373,9 +373,9 @@ LIBS=3D"" =20 # debug flags. -WARN_FLAGS=3D"-Wall -W -Wshadow -Wold-style-declaration -Wold-style-defi= nition -Wpointer-arith -Wmissing-prototypes -Wundef -Wextra -Waddress -Wa= rray-bounds -Wattributes -Wbuiltin-macro-redefined -Wcast-align -Wchar-su= bscripts -Wclobbered -Wcomment -Wcoverage-mismatch -Wdeprecated -Wdepreca= ted-declarations -Wdisabled-optimization -Wdiv-by-zero -Wempty-body -Wend= if-labels -Wfloat-equal -Wformat-contains-nul -Wformat-extra-args -Wforma= t-security -Wformat-y2k -Wignored-qualifiers -Wimplicit -Wimplicit-functi= on-declaration -Wimplicit-int -Winit-self -Winline -Wint-to-pointer-cast = -Winvalid-pch -Wunsafe-loop-optimizations -Wlogical-op -Wmain -Wmissing-b= races -Wmissing-field-initializers -Wmissing-format-attribute -Wmissing-n= oreturn -Wmudflap -Wmultichar -Wnonnull -Woverflow -Wpacked-bitfield-comp= at -Wparentheses -Wpointer-arith -Wpointer-to-int-cast -Wreturn-type -Wse= quence-point -Wshadow -Wsign-compare -Wstack-protector -Wstrict-aliasing = -Wstrict-overflow -Wswitch -Wsync-nand -Wtrigraphs -Wtype-limits -Wundef= -Wuninitialized -Wunknown-pragmas -Wunreachable-code -Wunused -Wunused-f= unction -Wunused-label -Wunused-parameter -Wunused-result -Wunused-value = -Wunused-variable -Wvariadic-macros -Wvolatile-register-var -Wwrite-stri= ngs -Wmissing-declarations -Wmissing-parameter-type -Wmissing-prototypes= -Wnested-externs -Wstrict-prototypes -Wpointer-sign" +WARN_FLAGS=3D"-Wall -W -Wshadow -Wold-style-declaration -Wold-style-defi= nition -Wpointer-arith -Wundef -Wextra -Waddress -Warray-bounds -Wattribu= tes -Wbuiltin-macro-redefined -Wcast-align -Wchar-subscripts -Wclobbered = -Wcomment -Wcoverage-mismatch -Wdeprecated -Wdeprecated-declarations -Wdi= sabled-optimization -Wdiv-by-zero -Wempty-body -Wendif-labels -Wfloat-equ= al -Wformat-contains-nul -Wformat-extra-args -Wformat-security -Wformat-y= 2k -Wignored-qualifiers -Wimplicit -Wimplicit-function-declaration -Wimpl= icit-int -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wunsafe-loop-op= timizations -Wlogical-op -Wmain -Wmissing-braces -Wmissing-field-initiali= zers -Wmissing-format-attribute -Wmissing-noreturn -Wmudflap -Wmultichar = -Wnonnull -Woverflow -Wpacked-bitfield-compat -Wparentheses -Wpointer-ari= th -Wpointer-to-int-cast -Wreturn-type -Wsequence-point -Wshadow -Wsign-c= ompare -Wstack-protector -Wstrict-aliasing -Wswitch -Wsync-nand -Wtrigrap= hs -Wtype-limits -Wundef -Wuninitialized -Wunknown-pragmas -Wunreachable= -code -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunus= ed-result -Wunused-value -Wunused-variable -Wvariadic-macros -Wvolatile-= register-var -Wwrite-strings -Wmissing-declarations -Wmissing-parameter-t= ype -Wmissing-prototypes -Wnested-externs -Wstrict-prototypes -Wpointer-= sign" HOST_CFLAGS=3D"$HOST_CFLAGS $WARN_FLAGS" -TARGET_CFLAGS=3D"$TARGET_CFLAGS $WARN_FLAGS -g -Wredundant-decls" +TARGET_CFLAGS=3D"$TARGET_CFLAGS $WARN_FLAGS -g -Wredundant-decls -Wmissi= ng-prototypes" TARGET_CCASFLAGS=3D"$TARGET_CCASFLAGS -g" =20 # Force no alignment to save space on i386. =3D=3D=3D modified file 'docs/grub.texi' --- docs/grub.texi 2012-01-31 21:59:32 +0000 +++ docs/grub.texi 2012-02-10 17:11:59 +0000 @@ -20,7 +20,7 @@ This manual is for GNU GRUB (version @value{VERSION}, @value{UPDATED}). =20 -Copyright @copyright{} 1999,2000,2001,2002,2004,2006,2008,2009,2010 Free= Software Foundation, Inc. +Copyright @copyright{} 1999,2000,2001,2002,2004,2006,2008,2009,2010,2011= ,2012 Free Software Foundation, Inc. =20 @quotation Permission is granted to copy, distribute and/or modify this document =3D=3D=3D modified file 'gentpl.py' --- gentpl.py 2011-12-24 14:09:26 +0000 +++ gentpl.py 2012-02-10 17:10:18 +0000 @@ -1,4 +1,19 @@ #! /usr/bin/python +# GRUB -- GRand Unified Bootloader +# Copyright (C) 2010,2011 Free Software Foundation, Inc. +# +# GRUB is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# GRUB is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GRUB. If not, see . =20 # # This is the python script used to generate Makefile.tpl =3D=3D=3D modified file 'grub-core/disk/diskfilter.c' --- grub-core/disk/diskfilter.c 2012-02-09 22:43:43 +0000 +++ grub-core/disk/diskfilter.c 2012-02-10 19:54:58 +0000 @@ -260,6 +260,24 @@ return list; } =20 +void +grub_diskfilter_print_partmap (grub_disk_t disk) +{ + struct grub_diskfilter_lv *lv =3D disk->data; + struct grub_diskfilter_pv *pv; + + if (lv->vg->pvs) + for (pv =3D lv->vg->pvs; pv; pv =3D pv->next) + { + grub_size_t s; + if (!pv->disk) + grub_util_error (_("Couldn't find physical volume `%s'." + " Check your device.map"), pv->name); + for (s =3D 0; pv->partmaps[s]; s++) + grub_printf ("%s ", pv->partmaps[s]); + } +} + static const char * grub_diskfilter_getname (struct grub_disk *disk) { @@ -964,6 +982,19 @@ pv->part_start =3D grub_partition_get_start (disk->partition); pv->part_size =3D grub_disk_get_size (disk); =20 +#ifdef GRUB_UTIL + { + grub_size_t s =3D 1; + grub_partition_t p; + for (p =3D disk->partition; p; p =3D p->parent) + s++; + pv->partmaps =3D xmalloc (s * sizeof (pv->partmaps[0])); + s =3D 0; + for (p =3D disk->partition; p; p =3D p->parent) + pv->partmaps[s++] =3D xstrdup (p->partmap->name); + pv->partmaps[s++] =3D 0; + } +#endif if (start_sector !=3D (grub_uint64_t)-1) pv->start_sector =3D start_sector; pv->start_sector +=3D pv->part_start; =3D=3D=3D modified file 'grub-core/kern/emu/full.c' --- grub-core/kern/emu/full.c 2012-02-09 22:15:27 +0000 +++ grub-core/kern/emu/full.c 2012-02-10 20:37:43 +0000 @@ -50,7 +50,7 @@ grub_no_autoload =3D 1; } =20 -#ifdef __ia64__ +#if defined (__ia64__) || defined (__powerpc__) void grub_arch_dl_get_tramp_got_size (const void *ehdr __attribute__ ((u= nused)), grub_size_t *tramp, grub_size_t *got) { =3D=3D=3D modified file 'grub-core/script/execute.c' --- grub-core/script/execute.c 2012-02-04 11:21:21 +0000 +++ grub-core/script/execute.c 2012-02-10 22:24:15 +0000 @@ -26,6 +26,7 @@ #include #include #include +#include =20 /* Max digits for a char is 3 (0xFF is 255), similarly for an int it is sizeof (int) * 3, and one extra for a possible -ve sign. */ @@ -312,8 +313,8 @@ struct grub_script_arg *arg =3D 0; struct grub_script_argv result =3D { 0, 0, 0 }; =20 - auto int append (char *s, int escape_type); - int append (char *s, int escape_type) + auto int append (const char *s, int escape_type); + int append (const char *s, int escape_type) { int r; char *p =3D 0; @@ -379,12 +380,20 @@ break; =20 case GRUB_SCRIPT_ARG_TYPE_TEXT: - if (grub_strlen (arg->str) && + if (arg->str[0] && grub_script_argv_append (&result, arg->str, grub_strlen (arg->str))) goto fail; break; =20 + case GRUB_SCRIPT_ARG_TYPE_GETTEXT: + { + const char *t =3D _(arg->str); + if (grub_script_argv_append (&result, t, grub_strlen (t))) + goto fail; + } + break; + case GRUB_SCRIPT_ARG_TYPE_DQSTR: case GRUB_SCRIPT_ARG_TYPE_SQSTR: if (append (arg->str, 1)) =3D=3D=3D modified file 'grub-core/script/yylex.l' --- grub-core/script/yylex.l 2012-02-03 10:56:49 +0000 +++ grub-core/script/yylex.l 2012-02-10 22:20:27 +0000 @@ -131,15 +131,17 @@ SQCHR [^\'] DQCHR {ESC}|[^\\\"] DQSTR \"{DQCHR}*\" +I18NSTR \$\"{DQCHR}*\" SQSTR \'{SQCHR}*\' SPECIAL \?|\#|\*|\@ VARIABLE ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|${SPECIAL}|$= \{{SPECIAL}\} -WORD ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+ +WORD ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE}|{I18NSTR})+ =20 MULTILINE {WORD}?((\"{DQCHR}*)|(\'{SQCHR}*)|(\\\n)) =20 %x SPLIT %x DQUOTE +%x I18NQUOTE %x SQUOTE %x VAR =20 @@ -215,6 +217,10 @@ yy_push_state (SQUOTE, yyscanner); ARG (GRUB_SCRIPT_ARG_TYPE_TEXT); } + "\$\"" { + yy_push_state (I18NQUOTE, yyscanner); + ARG (GRUB_SCRIPT_ARG_TYPE_GETTEXT); + } \$ { yy_push_state (VAR, yyscanner); ARG (GRUB_SCRIPT_ARG_TYPE_TEXT); @@ -280,6 +286,18 @@ (.|\n) { COPY (yytext, yyleng); } } =20 +{ + \\\\ { COPY ("\\", 1); } + \\\" { COPY ("\"", 1); } + \\\n { /* ignore */ } + [^\"\\\n]+ { COPY (yytext, yyleng); } + \" { + yy_pop_state (yyscanner); + ARG (GRUB_SCRIPT_ARG_TYPE_GETTEXT); + } + (.|\n) { COPY (yytext, yyleng); } +} + <> { yypop_buffer_state (yyscanner); yyextra->lexerstate->eof =3D 1; =3D=3D=3D modified file 'include/grub/diskfilter.h' --- include/grub/diskfilter.h 2012-01-29 13:28:01 +0000 +++ include/grub/diskfilter.h 2012-02-10 19:53:29 +0000 @@ -72,6 +72,9 @@ struct grub_diskfilter_pv *next; /* Optional. */ grub_uint8_t *internal_id; +#ifdef GRUB_UTIL + char **partmaps; +#endif }; =20 struct grub_diskfilter_lv { @@ -186,6 +189,8 @@ struct grub_diskfilter_pv * grub_diskfilter_get_pv_from_disk (grub_disk_t disk, struct grub_diskfilter_vg **vg); +void +grub_diskfilter_print_partmap (grub_disk_t disk); #endif =20 #endif /* ! GRUB_RAID_H */ =3D=3D=3D modified file 'include/grub/script_sh.h' --- include/grub/script_sh.h 2011-11-11 19:34:37 +0000 +++ include/grub/script_sh.h 2012-02-10 20:30:33 +0000 @@ -53,6 +53,7 @@ { GRUB_SCRIPT_ARG_TYPE_VAR, GRUB_SCRIPT_ARG_TYPE_TEXT, + GRUB_SCRIPT_ARG_TYPE_GETTEXT, GRUB_SCRIPT_ARG_TYPE_DQVAR, GRUB_SCRIPT_ARG_TYPE_DQSTR, GRUB_SCRIPT_ARG_TYPE_SQSTR, =3D=3D=3D modified file 'util/getroot.c' --- util/getroot.c 2012-02-10 12:17:12 +0000 +++ util/getroot.c 2012-02-10 18:48:24 +0000 @@ -372,7 +372,7 @@ char *buf =3D NULL; size_t len =3D 0; char **ret =3D NULL; - int entry_len =3D 0, entry_max =3D 4; + grub_size_t entry_len =3D 0, entry_max =3D 4; struct mountinfo_entry *entries; struct mountinfo_entry parent_entry =3D { 0, 0, 0, "", "", "", "" }; int i; @@ -1991,7 +1991,7 @@ const grub_partition_t partition) { grub_disk_addr_t part_start =3D 0; - grub_util_info ("Partition %d starts from %lu", + grub_util_info ("Partition %d starts from %" PRIuGRUB_UINT64_T, partition->number, partition->start); =20 part_start =3D grub_partition_get_start (partition); @@ -2022,7 +2022,7 @@ return 0; } =20 - grub_util_info ("%s starts from %lu", os_dev, start); + grub_util_info ("%s starts from %" PRIuGRUB_UINT64_T, os_dev, start)= ; =20 if (start =3D=3D 0 && device_is_wholedisk (os_dev)) return name; =3D=3D=3D modified file 'util/grub-mkimage.c' --- util/grub-mkimage.c 2012-02-10 12:56:18 +0000 +++ util/grub-mkimage.c 2012-02-10 23:30:37 +0000 @@ -714,7 +714,7 @@ grub_uint64_t start_address; void *rel_section; grub_size_t reloc_size, align; - size_t decompress_size; + size_t decompress_size =3D 0; =20 if (comp =3D=3D COMPRESSION_AUTO) comp =3D image_target->default_compression; =3D=3D=3D modified file 'util/grub-mkimagexx.c' --- util/grub-mkimagexx.c 2012-02-10 12:56:18 +0000 +++ util/grub-mkimagexx.c 2012-02-10 23:34:17 +0000 @@ -182,6 +182,7 @@ =20 #define MASK20 ((1 << 20) - 1) #define MASK19 ((1 << 19) - 1) +#define MASK3 (~(grub_addr_t) 3) =20 static void add_value_to_slot_20b (grub_addr_t addr, grub_uint32_t value) @@ -190,17 +191,17 @@ switch (addr & 3) { case 0: - p =3D (struct unaligned_uint32 *) ((addr & ~3ULL) + 2); + p =3D (struct unaligned_uint32 *) ((addr & MASK3) + 2); p->val =3D ((((((p->val >> 2) & MASK20) + value) & MASK20) << 2)=20 | (p->val & ~(MASK20 << 2))); break; case 1: - p =3D (struct unaligned_uint32 *) ((grub_uint8_t *) (addr & ~3ULL)= + 7); + p =3D (struct unaligned_uint32 *) ((grub_uint8_t *) (addr & MASK3)= + 7); p->val =3D ((((((p->val >> 3) & MASK20) + value) & MASK20) << 3) | (p->val & ~(MASK20 << 3))); break; case 2: - p =3D (struct unaligned_uint32 *) ((grub_uint8_t *) (addr & ~3ULL)= + 12); + p =3D (struct unaligned_uint32 *) ((grub_uint8_t *) (addr & MASK3)= + 12); p->val =3D ((((((p->val >> 4) & MASK20) + value) & MASK20) << 4) | (p->val & ~(MASK20 << 4))); break; @@ -227,15 +228,15 @@ switch (addr & 3) { case 0: - p =3D (struct unaligned_uint32 *) ((addr & ~3ULL) + 2); + p =3D (struct unaligned_uint32 *) ((addr & MASK3) + 2); p->val =3D ((add_value_to_slot_21_real (((p->val >> 2) & MASKF21),= value) & MASKF21) << 2) | (p->val & ~(MASKF21 << 2)); break; case 1: - p =3D (struct unaligned_uint32 *) ((grub_uint8_t *) (addr & ~3ULL)= + 7); + p =3D (struct unaligned_uint32 *) ((grub_uint8_t *) (addr & MASK3)= + 7); p->val =3D ((add_value_to_slot_21_real (((p->val >> 3) & MASKF21),= value) & MASKF21) << 3) | (p->val & ~(MASKF21 << 3)); break; case 2: - p =3D (struct unaligned_uint32 *) ((grub_uint8_t *) (addr & ~3ULL)= + 12); + p =3D (struct unaligned_uint32 *) ((grub_uint8_t *) (addr & MASK3)= + 12); p->val =3D ((add_value_to_slot_21_real (((p->val >> 4) & MASKF21),= value) & MASKF21) << 4) | (p->val & ~(MASKF21 << 4)); break; } @@ -457,8 +458,8 @@ - target_section_addr - (offset & ~3)) >> 4; tr++; if (noff & ~MASK19) - grub_util_error ("trampoline offset too big (%lx)", - noff); + grub_util_error ("trampoline offset too big (%" + PRIxGRUB_UINT64_T ")", noff); add_value_to_slot_20b ((grub_addr_t) target, noff); } break; @@ -919,7 +920,7 @@ grub_size_t kernel_size; grub_size_t ia64jmp_off =3D 0, ia64_toff =3D 0, ia64_got_off =3D 0; unsigned ia64jmpnum =3D 0; - Elf_Shdr *symtab_section; + Elf_Shdr *symtab_section =3D 0; grub_size_t got =3D 0; =20 *start =3D 0; =3D=3D=3D modified file 'util/grub-probe.c' --- util/grub-probe.c 2012-02-10 11:57:00 +0000 +++ util/grub-probe.c 2012-02-10 19:56:18 +0000 @@ -87,6 +87,9 @@ for (part =3D disk->partition; part; part =3D part->parent) printf ("%s ", part->partmap->name); =20 + if (disk->dev->id =3D=3D GRUB_DISK_DEVICE_DISKFILTER_ID) + grub_diskfilter_print_partmap (disk); + /* In case of LVM/RAID, check the member devices as well. */ if (disk->dev->memberlist) { @@ -304,7 +307,7 @@ raid_level =3D probe_raid_level (disk); if (raid_level >=3D 0) { - printf ("raid "); + printf ("diskfilter "); if (disk->dev->raidname) printf ("%s ", disk->dev->raidname (disk)); } =3D=3D=3D modified file 'util/import_gcry.py' --- util/import_gcry.py 2012-02-10 15:48:48 +0000 +++ util/import_gcry.py 2012-02-10 23:26:06 +0000 @@ -325,7 +325,7 @@ confutil.write (" common =3D grub-core/%s;\n" % src) if modname =3D=3D "gcry_rijndael" or modname =3D=3D "gcry_md= 4" or modname =3D=3D "gcry_md5" or modname =3D=3D "gcry_rmd160" or modnam= e =3D=3D "gcry_sha1" or modname =3D=3D "gcry_sha256" or modname =3D=3D "g= cry_sha512" or modname =3D=3D "gcry_tiger": # Alignment checked by hand - conf.write (" cflags =3D '$(CFLAGS_GCRY) -Wno-cast-alig= n';\n"); + conf.write (" cflags =3D '$(CFLAGS_GCRY) -Wno-cast-alig= n -Wno-strict-aliasing';\n"); else: conf.write (" cflags =3D '$(CFLAGS_GCRY)';\n"); conf.write (" cppflags =3D '$(CPPFLAGS_GCRY)';\n"); --------------000702030208050704090605--