vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2009-06-10 Pavel Roskin <proski@gnu.org>

Browse source 
* include/grub/multiboot2.h: Provide compatibility defines for
	multiboot2.h.
	* include/multiboot2.h: Include stdint.h only if needed, using
	angle brackets.
	* loader/i386/pc/multiboot2.c: Include multiboot2.h after
	grub/multiboot2.h.
	* loader/ieee1275/multiboot2.c: Likewise.
	* loader/multiboot2.c: Likewise.
	* loader/multiboot_loader.c: Likewise.
This commit is contained in:
proski 2009-06-10 20:11:12 +00:00
parent 437e6adcb4
commit 2763ac183d
7 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,5 +1,15 @@
2009-06-10 Pavel Roskin <proski@gnu.org> 2009-06-10 Pavel Roskin <proski@gnu.org>
* include/grub/multiboot2.h: Provide compatibility defines for
multiboot2.h.
* include/multiboot2.h: Include stdint.h only if needed, using
angle brackets.
* loader/i386/pc/multiboot2.c: Include multiboot2.h after
grub/multiboot2.h.
* loader/ieee1275/multiboot2.c: Likewise.
* loader/multiboot2.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* configure.ac: Use -nostdlib when probing for the target. It * configure.ac: Use -nostdlib when probing for the target. It
should not be required to have libc for the target. should not be required to have libc for the target.

6
include/grub/multiboot2.h
View file

@ -24,6 +24,12 @@
#include <grub/err.h> #include <grub/err.h>
#include <grub/elf.h> #include <grub/elf.h>
#ifndef GRUB_UTIL
typedef grub_uint32_t uint32_t;
typedef grub_uint64_t uint64_t;
#define __WORDSIZE (8 * GRUB_TARGET_SIZEOF_VOID_P)
#endif
struct multiboot_tag_header; struct multiboot_tag_header;
grub_err_t grub_err_t

4
include/multiboot2.h
View file

@ -34,7 +34,9 @@
#ifndef ASM_FILE #ifndef ASM_FILE
#include "stdint.h" #ifndef __WORDSIZE
#include <stdint.h>
#endif
/* XXX not portable? */ /* XXX not portable? */
#if __WORDSIZE == 64 #if __WORDSIZE == 64

2
loader/i386/pc/multiboot2.c
View file

@ -17,8 +17,8 @@
* along with GRUB. If not, see <http://www.gnu.org/licenses/>. * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <multiboot2.h>
#include <grub/multiboot2.h> #include <grub/multiboot2.h>
#include <multiboot2.h>
#include <grub/elf.h> #include <grub/elf.h>
#include <grub/err.h> #include <grub/err.h>
#include <grub/machine/loader.h> #include <grub/machine/loader.h>

2
loader/ieee1275/multiboot2.c
View file

@ -17,10 +17,10 @@
* along with GRUB. If not, see <http://www.gnu.org/licenses/>. * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <multiboot2.h>
#include <grub/loader.h> #include <grub/loader.h>
#include <grub/ieee1275/ieee1275.h> #include <grub/ieee1275/ieee1275.h>
#include <grub/multiboot2.h> #include <grub/multiboot2.h>
#include <multiboot2.h>
#include <grub/err.h> #include <grub/err.h>
#include <grub/elf.h> #include <grub/elf.h>
#include <grub/misc.h> #include <grub/misc.h>

2
loader/multiboot2.c
View file

@ -17,10 +17,10 @@
* along with GRUB. If not, see <http://www.gnu.org/licenses/>. * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <multiboot2.h>
#include <grub/loader.h> #include <grub/loader.h>
#include <grub/machine/loader.h> #include <grub/machine/loader.h>
#include <grub/multiboot2.h> #include <grub/multiboot2.h>
#include <multiboot2.h>
#include <grub/elfload.h> #include <grub/elfload.h>
#include <grub/file.h> #include <grub/file.h>
#include <grub/err.h> #include <grub/err.h>

2
loader/multiboot_loader.c
View file

@ -17,10 +17,10 @@
* along with GRUB. If not, see <http://www.gnu.org/licenses/>. * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <multiboot2.h>
#include <grub/machine/machine.h> #include <grub/machine/machine.h>
#include <grub/multiboot.h> #include <grub/multiboot.h>
#include <grub/multiboot2.h> #include <grub/multiboot2.h>
#include <multiboot2.h>
#include <grub/elf.h> #include <grub/elf.h>
#include <grub/file.h> #include <grub/file.h>
#include <grub/err.h> #include <grub/err.h>