diff --git a/ChangeLog b/ChangeLog index 4f8558938..156a167e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-08-06 Robert Millan + + * conf/i386-coreboot.rmk (kernel_elf_ASFLAGS): New variable. + * kern/i386/tsc.c: Include `'. + 2008-08-06 Bean * fs/i386/pc/pxe.c (grub_pxe_data): New member block_size. diff --git a/conf/i386-coreboot.mk b/conf/i386-coreboot.mk index 6f68a0e51..f766b9f4b 100644 --- a/conf/i386-coreboot.mk +++ b/conf/i386-coreboot.mk @@ -150,6 +150,7 @@ kernel_elf_HEADERS = arg.h boot.h cache.h device.h disk.h dl.h elf.h elfload.h \ machine/boot.h machine/console.h machine/init.h \ machine/memory.h machine/loader.h kernel_elf_CFLAGS = $(COMMON_CFLAGS) +kernel_elf_ASFLAGS = $(COMMON_ASFLAGS) kernel_elf_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x8200,-Bstatic MOSTLYCLEANFILES += symlist.c kernel_syms.lst diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk index 5aee1f8c2..4827c0f81 100644 --- a/conf/i386-coreboot.rmk +++ b/conf/i386-coreboot.rmk @@ -31,6 +31,7 @@ kernel_elf_HEADERS = arg.h boot.h cache.h device.h disk.h dl.h elf.h elfload.h \ machine/boot.h machine/console.h machine/init.h \ machine/memory.h machine/loader.h kernel_elf_CFLAGS = $(COMMON_CFLAGS) +kernel_elf_ASFLAGS = $(COMMON_ASFLAGS) kernel_elf_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x8200,-Bstatic MOSTLYCLEANFILES += symlist.c kernel_syms.lst diff --git a/kern/i386/tsc.c b/kern/i386/tsc.c index 458fc0ec9..4d3f05a26 100644 --- a/kern/i386/tsc.c +++ b/kern/i386/tsc.c @@ -24,6 +24,7 @@ #include #include #include +#include /* This defines the value TSC had at the epoch (that is, when we calibrated it). */ static grub_uint64_t tsc_boot_time;