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

2009-07-01 Robert Millan <rmh.grub@aybabtu.com>

Browse source 
* conf/i386.rmk (setjmp_mod_SOURCES)
        (setjmp_mod_ASFLAGS, setjmp_mod_LDFLAGS): Move to ...
        * conf/common.rmk (setjmp_mod_SOURCES)
        (setjmp_mod_ASFLAGS, setjmp_mod_LDFLAGS): ... here, and modify
        to use $(target_cpu).
        * conf/x86_64-efi.rmk (setjmp_mod_SOURCES)
        (setjmp_mod_ASFLAGS, setjmp_mod_LDFLAGS): Remove.
        * conf/powerpc-ieee1275.rmk: Likewise.
        * conf/sparc64-ieee1275.rmk: Likewise.

        * conf/i386-pc.rmk (kernel_img_SOURCES): Use
        $(target_cpu) for kern/$(target_cpu)/dl.c.
        * conf/i386-efi.rmk: Likewise.
        * conf/i386-ieee1275.rmk: Likewise.
        * conf/x86_64-efi.rmk: Likewise.
        * conf/i386-coreboot.rmk: Likewise.
        * conf/powerpc-ieee1275.rmk (kernel_img_SOURCES): Use
        $(target_cpu) for kern/$(target_cpu)/dl.c and for
        kern/$(target_cpu)/cache.S.
        * conf/sparc64-ieee1275.rmk: Likewise.
This commit is contained in:
robertmh 2009-07-01 12:59:47 +00:00
parent a337130b25
commit aaf53e3ce3
10 changed files with 38 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ChangeLog
View file

@ -1,3 +1,26 @@
2009-07-01 Robert Millan <rmh.grub@aybabtu.com>
* conf/i386.rmk (setjmp_mod_SOURCES)
(setjmp_mod_ASFLAGS, setjmp_mod_LDFLAGS): Move to ...
* conf/common.rmk (setjmp_mod_SOURCES)
(setjmp_mod_ASFLAGS, setjmp_mod_LDFLAGS): ... here, and modify
to use $(target_cpu).
* conf/x86_64-efi.rmk (setjmp_mod_SOURCES)
(setjmp_mod_ASFLAGS, setjmp_mod_LDFLAGS): Remove.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/i386-pc.rmk (kernel_img_SOURCES): Use
$(target_cpu) for kern/$(target_cpu)/dl.c.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* conf/i386-coreboot.rmk: Likewise.
* conf/powerpc-ieee1275.rmk (kernel_img_SOURCES): Use
$(target_cpu) for kern/$(target_cpu)/dl.c and for
kern/$(target_cpu)/cache.S.
* conf/sparc64-ieee1275.rmk: Likewise.
2009-07-01 Robert Millan <rmh.grub@aybabtu.com>
* include/grub/i386/linux.h (linux_kernel_params): Change `mmap_size'

5
conf/common.rmk
View file

@ -598,3 +598,8 @@ pkglib_MODULES += xnu_uuid.mod
xnu_uuid_mod_SOURCES = commands/xnu_uuid.c
xnu_uuid_mod_CFLAGS = $(COMMON_CFLAGS)
xnu_uuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
pkglib_MODULES += setjmp.mod
setjmp_mod_SOURCES = lib/$(target_cpu)/setjmp.S
setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS)

4
conf/i386-coreboot.rmk
View file

@ -23,7 +23,7 @@ kernel_img_SOURCES = kern/i386/coreboot/startup.S \
kern/misc.c kern/mm.c kern/reader.c kern/term.c \
kern/rescue_parser.c kern/rescue_reader.c \
kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
kern/i386/dl.c kern/parser.c kern/partition.c \
kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
kern/i386/tsc.c kern/i386/pit.c \
kern/generic/rtc_get_time_ms.c \
kern/generic/millisleep.c \
@ -66,7 +66,7 @@ kernel_img_SOURCES = kern/i386/qemu/startup.S \
kern/misc.c kern/mm.c kern/reader.c kern/term.c \
kern/rescue_parser.c kern/rescue_reader.c \
kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
kern/i386/dl.c kern/parser.c kern/partition.c \
kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
kern/i386/tsc.c kern/i386/pit.c \
kern/generic/rtc_get_time_ms.c \
kern/generic/millisleep.c \

2
conf/i386-efi.rmk
View file

@ -92,7 +92,7 @@ kernel_mod_SOURCES = kern/i386/efi/startup.S kern/main.c kern/device.c \
kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
kern/misc.c kern/mm.c kern/reader.c kern/term.c \
kern/rescue_parser.c kern/rescue_reader.c \
kern/i386/dl.c kern/i386/efi/init.c kern/parser.c kern/partition.c \
kern/$(target_cpu)/dl.c kern/i386/efi/init.c kern/parser.c kern/partition.c \
kern/env.c symlist.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c \
term/efi/console.c disk/efi/efidisk.c \
kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \

2
conf/i386-ieee1275.rmk
View file

@ -21,7 +21,7 @@ kernel_img_SOURCES = kern/i386/ieee1275/startup.S \
kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
kern/misc.c kern/mm.c kern/reader.c kern/term.c \
kern/rescue_parser.c kern/rescue_reader.c \
kern/i386/dl.c kern/parser.c kern/partition.c \
kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
kern/env.c \
kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
kern/generic/millisleep.c \

2
conf/i386-pc.rmk
View file

@ -53,7 +53,7 @@ kernel_img_SOURCES = kern/i386/pc/startup.S \
kern/misc.c kern/mm.c kern/reader.c kern/term.c \
kern/rescue_parser.c kern/rescue_reader.c \
kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
kern/i386/dl.c kern/i386/pc/init.c kern/i386/pc/mmap.c \
kern/$(target_cpu)/dl.c kern/i386/pc/init.c kern/i386/pc/mmap.c \
kern/parser.c kern/partition.c \
kern/i386/tsc.c kern/i386/pit.c \
kern/generic/rtc_get_time_ms.c \

6
conf/i386.rmk
View file

@ -14,9 +14,3 @@ pkglib_MODULES += vga_text.mod
vga_text_mod_SOURCES = term/i386/pc/vga_text.c term/i386/vga_common.c
vga_text_mod_CFLAGS = $(COMMON_CFLAGS)
vga_text_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For setjmp.mod
pkglib_MODULES += setjmp.mod
setjmp_mod_SOURCES = lib/i386/setjmp.S
setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS)

10
conf/powerpc-ieee1275.rmk
View file

@ -92,9 +92,9 @@ kernel_img_SOURCES = kern/powerpc/ieee1275/startup.S kern/ieee1275/cmain.c \
kern/ieee1275/mmap.c \
term/ieee1275/ofconsole.c \
kern/ieee1275/openfw.c disk/ieee1275/ofdisk.c \
kern/parser.c kern/partition.c kern/env.c kern/powerpc/dl.c \
kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c \
kern/generic/millisleep.c kern/time.c \
symlist.c kern/powerpc/cache.S
symlist.c kern/$(target_cpu)/cache.S
kernel_img_CFLAGS = $(COMMON_CFLAGS)
kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
@ -162,10 +162,4 @@ lsmmap_mod_SOURCES = commands/lsmmap.c
lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For setjmp.mod
pkglib_MODULES += setjmp.mod
setjmp_mod_SOURCES = lib/powerpc/setjmp.S
setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
include $(srcdir)/conf/common.mk

10
conf/sparc64-ieee1275.rmk
View file

@ -43,9 +43,9 @@ kernel_img_SOURCES = kern/sparc64/ieee1275/crt0.S kern/ieee1275/cmain.c \
kern/ieee1275/mmap.c \
term/ieee1275/ofconsole.c \
kern/ieee1275/openfw.c disk/ieee1275/ofdisk.c \
kern/parser.c kern/partition.c kern/env.c kern/sparc64/dl.c \
kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c \
kern/generic/millisleep.c kern/time.c \
symlist.c kern/sparc64/cache.S
symlist.c kern/$(target_cpu)/cache.S
kernel_img_CFLAGS = $(COMMON_CFLAGS)
kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
kernel_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,0x200000,-Bstatic,-melf64_sparc -static-libgcc -lgcc
@ -181,10 +181,4 @@ lsmmap_mod_SOURCES = commands/lsmmap.c
lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For setjmp.mod
pkglib_MODULES += setjmp.mod
setjmp_mod_SOURCES = lib/sparc64/setjmp.S
setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
include $(srcdir)/conf/common.mk

8
conf/x86_64-efi.rmk
View file

@ -90,7 +90,7 @@ kernel_mod_SOURCES = kern/x86_64/efi/startup.S kern/x86_64/efi/callwrap.S \
kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
kern/misc.c kern/mm.c kern/reader.c kern/term.c \
kern/rescue_parser.c kern/rescue_reader.c \
kern/x86_64/dl.c kern/i386/efi/init.c kern/parser.c kern/partition.c \
kern/$(target_cpu)/dl.c kern/i386/efi/init.c kern/parser.c kern/partition.c \
kern/env.c symlist.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c \
kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
kern/i386/tsc.c kern/i386/pit.c \
@ -200,10 +200,4 @@ xnu_mod_CFLAGS = $(COMMON_CFLAGS)
xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
# For setjmp.mod
pkglib_MODULES += setjmp.mod
setjmp_mod_SOURCES = lib/x86_64/setjmp.S
setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
include $(srcdir)/conf/common.mk