source: build-files/ports-overlay/sysutils/grub2/files/patch-grub-core-loader-i386-bsd.c @ 2dfacf2

9.2-releasereleng/10.0releng/10.0.1releng/10.0.2
Last change on this file since 2dfacf2 was 2dfacf2, checked in by Kris Moore <kris@…>, 14 months ago

Add updated grub2 port, and set some options when we build it.

Remove a defunct port from gnome-meta-utils

  • Property mode set to 100644
File size: 1.3 KB
Line 
1=== modified file 'grub-core/loader/i386/bsd.c'
2--- grub-core/loader/i386/bsd.c 2012-06-07 14:41:52 +0000
3+++ grub-core/loader/i386/bsd.c 2012-07-21 17:44:45 +0000
4@@ -1309,7 +1309,7 @@
5       && phdr->p_type != PT_DYNAMIC)
6       return 0;
7 
8-  paddr = phdr->p_paddr & 0xFFFFFF;
9+  paddr = phdr->p_paddr & 0xFFFFFFF;
10 
11   if (paddr < kern_start)
12     kern_start = paddr;
13@@ -1333,7 +1333,7 @@
14     }
15 
16   *do_load = 1;
17-  phdr->p_paddr &= 0xFFFFFF;
18+  phdr->p_paddr &= 0xFFFFFFF;
19   paddr = phdr->p_paddr;
20 
21   *addr = (grub_addr_t) (paddr - kern_start + (grub_uint8_t *) kern_chunk_src);
22@@ -1351,7 +1351,7 @@
23       && phdr->p_type != PT_DYNAMIC)
24     return 0;
25 
26-  paddr = phdr->p_paddr & 0xffffff;
27+  paddr = phdr->p_paddr & 0xfffffff;
28 
29   if (paddr < kern_start)
30     kern_start = paddr;
31@@ -1375,7 +1375,7 @@
32     }
33 
34   *do_load = 1;
35-  paddr = phdr->p_paddr & 0xffffff;
36+  paddr = phdr->p_paddr & 0xfffffff;
37 
38   *addr = (grub_addr_t) (paddr - kern_start + (grub_uint8_t *) kern_chunk_src);
39 
40@@ -1394,7 +1394,7 @@
41     {
42       grub_relocator_chunk_t ch;
43 
44-      entry = elf->ehdr.ehdr32.e_entry & 0xFFFFFF;
45+      entry = elf->ehdr.ehdr32.e_entry & 0xFFFFFFF;
46       err = grub_elf32_phdr_iterate (elf, filename,
47                                     grub_bsd_elf32_size_hook, NULL);
48       if (err)
49
Note: See TracBrowser for help on using the repository browser.