| blob | d1f996abf2626d409232a45f980f2608d368246c |
1 diff -ruN grub-2.02/grub-core/fs/affs.c grub-2.02.aros/grub-core/fs/affs.c
2 --- grub-2.02/grub-core/fs/affs.c 2015-05-21 16:50:29.000000000 +0100
3 +++ grub-2.02.aros/grub-core/fs/affs.c 2017-04-24 12:30:25.000000000 +0100
4 @@ -202,7 +202,9 @@
5 goto fail;
7 /* Make sure this is an affs filesystem. */
8 - if (grub_strncmp ((char *) (data->bblock.type), "DOS", 3) != 0
9 + if (((grub_strncmp ((char *) (data->bblock.type), "DOS", 3) != 0)
10 + /* Test if the filesystem is a muFS filesystem. */
11 + && (grub_strncmp ((char *) (data->bblock.type), "muF", 3) != 0))
12 /* Test if the filesystem is a OFS filesystem. */
13 || !(data->bblock.flags & GRUB_AFFS_FLAG_FFS))
14 continue;
15 diff -ruN grub-2.02/grub-core/fs/btrfs.c grub-2.02.aros/grub-core/fs/btrfs.c
16 --- grub-2.02/grub-core/fs/btrfs.c 2017-04-24 10:16:00.000000000 +0100
17 +++ grub-2.02.aros/grub-core/fs/btrfs.c 2017-04-24 12:30:25.000000000 +0100
18 @@ -175,7 +175,7 @@
19 {
20 grub_int64_t sec;
21 grub_uint32_t nanosec;
22 -} __attribute__ ((aligned (4)));
23 +} GRUB_PACKED;
25 struct grub_btrfs_inode
26 {
27 diff -ruN grub-2.02/grub-core/osdep/aros/getroot.c grub-2.02.aros/grub-core/osdep/aros/getroot.c
28 --- grub-2.02/grub-core/osdep/aros/getroot.c 2015-05-21 16:50:29.000000000 +0100
29 +++ grub-2.02.aros/grub-core/osdep/aros/getroot.c 2017-04-24 12:30:25.000000000 +0100
30 @@ -29,7 +29,6 @@
32 #include <string.h>
33 #include <dos/dos.h>
34 -#include <dos/filesystem.h>
35 #include <dos/exall.h>
36 #include <proto/dos.h>
37 #include <proto/exec.h>
38 diff -ruN grub-2.02/grub-core/osdep/aros/hostdisk.c grub-2.02.aros/grub-core/osdep/aros/hostdisk.c
39 --- grub-2.02/grub-core/osdep/aros/hostdisk.c 2016-02-28 14:22:21.000000000 +0000
40 +++ grub-2.02.aros/grub-core/osdep/aros/hostdisk.c 2017-04-24 12:30:25.000000000 +0100
41 @@ -45,7 +45,6 @@
43 #include <string.h>
44 #include <dos/dos.h>
45 -#include <dos/filesystem.h>
46 #include <dos/exall.h>
47 #include <proto/dos.h>
48 #include <devices/hardblocks.h>
49 diff -ruN grub-2.02/grub-core/osdep/aros/relpath.c grub-2.02.aros/grub-core/osdep/aros/relpath.c
50 --- grub-2.02/grub-core/osdep/aros/relpath.c 2015-05-21 16:50:29.000000000 +0100
51 +++ grub-2.02.aros/grub-core/osdep/aros/relpath.c 2017-04-24 12:30:25.000000000 +0100
52 @@ -29,7 +29,6 @@
54 #include <string.h>
55 #include <dos/dos.h>
56 -#include <dos/filesystem.h>
57 #include <dos/exall.h>
58 #include <proto/dos.h>
59 #include <proto/exec.h>
60 diff -ruN grub-2.02/include/grub/efiemu/runtime.h grub-2.02.aros/include/grub/efiemu/runtime.h
61 --- grub-2.02/include/grub/efiemu/runtime.h 2015-05-21 16:50:29.000000000 +0100
62 +++ grub-2.02.aros/include/grub/efiemu/runtime.h 2019-03-29 16:16:01.449086200 +0000
63 @@ -29,7 +29,7 @@
65 struct efi_variable
66 {
67 - grub_efi_guid_t guid;
68 + grub_efi_packed_guid_t guid;
69 grub_uint32_t namelen;
70 grub_uint32_t size;
71 grub_efi_uint32_t attributes;
72 diff -ruN grub-2.02/include/grub/gpt_partition.h grub-2.02.aros/include/grub/gpt_partition.h
73 --- grub-2.02/include/grub/gpt_partition.h 2015-05-21 16:50:29.000000000 +0100
74 +++ grub-2.02.aros/include/grub/gpt_partition.h 2019-03-29 16:16:48.443396000 +0000
75 @@ -28,7 +28,7 @@
76 grub_uint16_t data2;
77 grub_uint16_t data3;
78 grub_uint8_t data4[8];
79 -} __attribute__ ((aligned(8)));
80 +} GRUB_PACKED;
81 typedef struct grub_gpt_part_type grub_gpt_part_type_t;
83 #define GRUB_GPT_PARTITION_TYPE_EMPTY \
84 diff -ruN grub-2.02/util/grub-mkimagexx.c grub-2.02.aros/util/grub-mkimagexx.c
85 --- grub-2.02/util/grub-mkimagexx.c 2017-04-24 10:16:00.000000000 +0100
86 +++ grub-2.02.aros/util/grub-mkimagexx.c 2017-04-24 12:30:25.000000000 +0100
87 @@ -832,6 +832,7 @@
88 break;
90 case R_X86_64_PC32:
91 + case R_X86_64_PLT32:
92 {
93 grub_uint32_t *t32 = (grub_uint32_t *) target;
94 *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
95 diff -ruN grub-2.02/util/grub-module-verifier.c grub-2.02.aros/util/grub-module-verifier.c
96 --- grub-2.02/util/grub-module-verifier.c 2017-04-24 10:16:00.000000000 +0100
97 +++ grub-2.02.aros/util/grub-module-verifier.c 2017-04-24 12:30:25.000000000 +0100
98 @@ -19,6 +19,7 @@
99 -1
100 }, (int[]){
101 R_X86_64_PC32,
102 + R_X86_64_PLT32,
103 -1
104 }
105 },