summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/grub/files/grub-1.99-gcc-4.7.0-strict-aliasing-errors.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-bsp/grub/files/grub-1.99-gcc-4.7.0-strict-aliasing-errors.patch')
-rw-r--r--meta/recipes-bsp/grub/files/grub-1.99-gcc-4.7.0-strict-aliasing-errors.patch147
1 files changed, 147 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/grub-1.99-gcc-4.7.0-strict-aliasing-errors.patch b/meta/recipes-bsp/grub/files/grub-1.99-gcc-4.7.0-strict-aliasing-errors.patch
new file mode 100644
index 0000000000..9d81050e43
--- /dev/null
+++ b/meta/recipes-bsp/grub/files/grub-1.99-gcc-4.7.0-strict-aliasing-errors.patch
@@ -0,0 +1,147 @@
1Upstream-Status: Pending
2
3This patch fixes these strick-aliasing errors with gcc 4.7
4
5
6| gcc -DHAVE_CONFIG_H -I. -I.. -Wall -W -I../include -I../include -DGRUB_MACHINE_EFI=1 -DGRUB_MACHINE=I386_EFI -nostdinc -isystem /usr/lib/gcc/x86_64-redhat-linux/4.7.0/include -DGRUB_FILE=\"fs/zfs/zfs.c\" -I. -I. -I.. -I.. -I../include -I../include -isystem/home/nitin/builds/build0/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -g -feliminate-unused-debug-types -Wall -W -Wshadow -Wpointer-arith -Wmissing-prototypes -Wundef -Wstrict-prototypes -g -falign-jumps=1 -falign-loops=1 -falign-functions=1 -mno-mmx -mno-sse -mno-sse2 -mno-3dnow -fno-dwarf2-cfi-asm -m32 -fno-stack-protector -mno-stack-arg-probe -Werror -Wno-trampolines -ffreestanding -isystem/home/nitin/builds/build0/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -c -o fs/zfs/zfs_module-zfs.o `test -f 'fs/zfs/zfs.c' || echo './'`fs/zfs/zfs.c
7| fs/zfs/zfs.c: In function 'get_filesystem_dnode':
8| fs/zfs/zfs.c:1449:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
9| fs/zfs/zfs.c:1449:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
10| fs/zfs/zfs.c: In function 'make_mdn':
11| fs/zfs/zfs.c:1478:3: error: dereferencing type-punned pointer will break strict-alERROR: Function failed: do_compile (see /home/nitin/builds/build0/tmp/work/x86_64-linux/grub-efi-i586-native-1.99-r7/temp/log.do_compile.9293 for further information)
12| iasing rules [-Werror=strict-aliasing]
13| fs/zfs/zfs.c: In function 'dnode_get_fullpath':
14| fs/zfs/zfs.c:1554:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
15| fs/zfs/zfs.c:1554:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
16| fs/zfs/zfs.c:1571:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
17| fs/zfs/zfs.c:1571:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
18| fs/zfs/zfs.c: In function 'grub_zfs_open':
19| fs/zfs/zfs.c:2234:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
20| fs/zfs/zfs.c:2234:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
21| fs/zfs/zfs.c: In function 'fill_fs_info':
22| fs/zfs/zfs.c:2362:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
23| fs/zfs/zfs.c:2362:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
24| fs/zfs/zfs.c:2395:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
25| fs/zfs/zfs.c:2395:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
26| fs/zfs/zfs.c: In function 'iterate_zap':
27| fs/zfs/zfs.c:2420:5: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
28| fs/zfs/zfs.c:2420:5: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
29| fs/zfs/zfs.c: In function 'grub_zfs_dir':
30| fs/zfs/zfs.c:2483:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
31| fs/zfs/zfs.c:2483:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
32| fs/zfs/zfs.c:2484:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
33| fs/zfs/zfs.c:2484:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
34| fs/zfs/zfs.c:2502:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
35| fs/zfs/zfs.c:2502:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
36| cc1: all warnings being treated as errors
37| make[3]: *** [fs/zfs/zfs_module-zfs.o] Error 1
38
39Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
402012/04/13
41
42Index: grub-1.99/grub-core/fs/zfs/zfs.c
43===================================================================
44--- grub-1.99.orig/grub-core/fs/zfs/zfs.c
45+++ grub-1.99/grub-core/fs/zfs/zfs.c
46@@ -1446,7 +1446,8 @@ get_filesystem_dnode (dnode_end_t * mosm
47 ch = *fsname;
48 *fsname = 0;
49
50- childobj = grub_zfs_to_cpu64 ((((dsl_dir_phys_t *) DN_BONUS (&mdn->dn)))->dd_child_dir_zapobj, mdn->endian);
51+ dsl_dir_phys_t * tmp = DN_BONUS (&mdn->dn);
52+ childobj = grub_zfs_to_cpu64 (tmp->dd_child_dir_zapobj, mdn->endian);
53 err = dnode_get (mosmdn, childobj,
54 DMU_OT_DSL_DIR_CHILD_MAP, mdn, data);
55 if (err)
56@@ -1475,7 +1476,8 @@ make_mdn (dnode_end_t * mdn, struct grub
57
58 grub_dprintf ("zfs", "endian = %d\n", mdn->endian);
59
60- bp = &(((dsl_dataset_phys_t *) DN_BONUS (&mdn->dn))->ds_bp);
61+ dsl_dataset_phys_t * tmp = DN_BONUS(&mdn->dn);
62+ bp = &(tmp->ds_bp);
63 err = zio_read (bp, mdn->endian, &osp, &ospsize, data);
64 if (err)
65 return err;
66@@ -1551,7 +1553,8 @@ dnode_get_fullpath (const char *fullpath
67
68 grub_dprintf ("zfs", "alive\n");
69
70- headobj = grub_zfs_to_cpu64 (((dsl_dir_phys_t *) DN_BONUS (&dn->dn))->dd_head_dataset_obj, dn->endian);
71+ dsl_dir_phys_t * tmp1 = DN_BONUS (&dn->dn);
72+ headobj = grub_zfs_to_cpu64 (tmp1->dd_head_dataset_obj, dn->endian);
73
74 grub_dprintf ("zfs", "endian = %d\n", mdn->endian);
75
76@@ -1568,7 +1571,8 @@ dnode_get_fullpath (const char *fullpath
77 {
78 grub_uint64_t snapobj;
79
80- snapobj = grub_zfs_to_cpu64 (((dsl_dataset_phys_t *) DN_BONUS (&mdn->dn))->ds_snapnames_zapobj, mdn->endian);
81+ dsl_dataset_phys_t * tmp2 = DN_BONUS (&mdn->dn);
82+ snapobj = grub_zfs_to_cpu64 (tmp2->ds_snapnames_zapobj, mdn->endian);
83
84 err = dnode_get (&(data->mos), snapobj,
85 DMU_OT_DSL_DS_SNAP_MAP, mdn, data);
86@@ -2231,7 +2235,8 @@ grub_zfs_open (struct grub_file *file, c
87 }
88 else
89 {
90- file->size = grub_zfs_to_cpu64 (((znode_phys_t *) DN_BONUS (&data->dnode.dn))->zp_size, data->dnode.endian);
91+ znode_phys_t * tmp = DN_BONUS (&data->dnode.dn);
92+ file->size = grub_zfs_to_cpu64 (tmp->zp_size, data->dnode.endian);
93 }
94
95 file->data = data;
96@@ -2359,7 +2364,8 @@ fill_fs_info (struct grub_dirhook_info *
97
98 if (mdn.dn.dn_type == DMU_OT_DSL_DIR)
99 {
100- headobj = grub_zfs_to_cpu64 (((dsl_dir_phys_t *) DN_BONUS (&mdn.dn))->dd_head_dataset_obj, mdn.endian);
101+ dsl_dir_phys_t * tmp1 = DN_BONUS (&mdn.dn);
102+ headobj = grub_zfs_to_cpu64 (tmp1->dd_head_dataset_obj, mdn.endian);
103
104 err = dnode_get (&(data->mos), headobj, DMU_OT_DSL_DATASET, &mdn, data);
105 if (err)
106@@ -2392,7 +2398,8 @@ fill_fs_info (struct grub_dirhook_info *
107 }
108
109 info->mtimeset = 1;
110- info->mtime = grub_zfs_to_cpu64 (((znode_phys_t *) DN_BONUS (&dn.dn))->zp_mtime[0], dn.endian);
111+ znode_phys_t * tmp2 = DN_BONUS (&dn.dn);
112+ info->mtime = grub_zfs_to_cpu64 (tmp2->zp_mtime[0], dn.endian);
113 return;
114 }
115
116@@ -2417,7 +2424,8 @@ grub_zfs_dir (grub_device_t device, cons
117
118 dnode_get (&(data->mdn), val, 0, &dn, data);
119 info.mtimeset = 1;
120- info.mtime = grub_zfs_to_cpu64 (((znode_phys_t *) DN_BONUS (&dn.dn))->zp_mtime[0], dn.endian);
121+ znode_phys_t * tmp1 = DN_BONUS (&dn.dn);
122+ info.mtime = grub_zfs_to_cpu64 (tmp1->zp_mtime[0], dn.endian);
123 info.dir = (dn.dn.dn_type == DMU_OT_DIRECTORY_CONTENTS);
124 grub_dprintf ("zfs", "type=%d, name=%s\n",
125 (int)dn.dn.dn_type, (char *)name);
126@@ -2480,8 +2488,9 @@ grub_zfs_dir (grub_device_t device, cons
127 fill_fs_info (&info, data->dnode, data);
128 hook ("@", &info);
129
130- childobj = grub_zfs_to_cpu64 (((dsl_dir_phys_t *) DN_BONUS (&data->dnode.dn))->dd_child_dir_zapobj, data->dnode.endian);
131- headobj = grub_zfs_to_cpu64 (((dsl_dir_phys_t *) DN_BONUS (&data->dnode.dn))->dd_head_dataset_obj, data->dnode.endian);
132+ dsl_dir_phys_t * tmp2 = DN_BONUS (&data->dnode.dn);
133+ childobj = grub_zfs_to_cpu64 (tmp2->dd_child_dir_zapobj, data->dnode.endian);
134+ headobj = grub_zfs_to_cpu64 (tmp2->dd_head_dataset_obj, data->dnode.endian);
135 err = dnode_get (&(data->mos), childobj,
136 DMU_OT_DSL_DIR_CHILD_MAP, &dn, data);
137 if (err)
138@@ -2499,7 +2508,8 @@ grub_zfs_dir (grub_device_t device, cons
139 return err;
140 }
141
142- snapobj = grub_zfs_to_cpu64 (((dsl_dataset_phys_t *) DN_BONUS (&dn.dn))->ds_snapnames_zapobj, dn.endian);
143+ dsl_dataset_phys_t * tmp3 = DN_BONUS (&dn.dn);
144+ snapobj = grub_zfs_to_cpu64 (tmp3->ds_snapnames_zapobj, dn.endian);
145
146 err = dnode_get (&(data->mos), snapobj,
147 DMU_OT_DSL_DS_SNAP_MAP, &dn, data);
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-26 08:01:15 +0000