[2377] 2009-07-01 Robert Millan <[email protected]>
Robert Millan <[email protected]> Wed, 01 Jul 2009 12:59:47 +0000
| Newsgroups | gmane.comp.boot-loaders.grub.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 2377
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2377
Author: robertmh
Date: 2009-07-01 12:59:47 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
2009-07-01 Robert Millan <[email protected]>
* 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.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/conf/common.rmk
trunk/grub2/conf/i386-coreboot.rmk
trunk/grub2/conf/i386-efi.rmk
trunk/grub2/conf/i386-ieee1275.rmk
trunk/grub2/conf/i386-pc.rmk
trunk/grub2/conf/i386.rmk
trunk/grub2/conf/powerpc-ieee1275.rmk
trunk/grub2/conf/sparc64-ieee1275.rmk
trunk/grub2/conf/x86_64-efi.rmk
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-07-01 01:04:12 UTC (rev 2376)
+++ trunk/grub2/ChangeLog 2009-07-01 12:59:47 UTC (rev 2377)
@@ -1,5 +1,28 @@
2009-07-01 Robert Millan <[email protected]>
+ * 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 <[email protected]>
+
* include/grub/i386/linux.h (linux_kernel_params): Change `mmap_size'
type to `grub_uint8_t', and adjust `padding9' accordingly.
Modified: trunk/grub2/conf/common.rmk
===================================================================
--- trunk/grub2/conf/common.rmk 2009-07-01 01:04:12 UTC (rev 2376)
+++ trunk/grub2/conf/common.rmk 2009-07-01 12:59:47 UTC (rev 2377)
@@ -598,3 +598,8 @@
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)
Modified: trunk/grub2/conf/i386-coreboot.rmk
===================================================================
--- trunk/grub2/conf/i386-coreboot.rmk 2009-07-01 01:04:12 UTC (rev 2376)
+++ trunk/grub2/conf/i386-coreboot.rmk 2009-07-01 12:59:47 UTC (rev 2377)
@@ -23,7 +23,7 @@
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 @@
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 \
Modified: trunk/grub2/conf/i386-efi.rmk
===================================================================
--- trunk/grub2/conf/i386-efi.rmk 2009-07-01 01:04:12 UTC (rev 2376)
+++ trunk/grub2/conf/i386-efi.rmk 2009-07-01 12:59:47 UTC (rev 2377)
@@ -92,7 +92,7 @@
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 \
Modified: trunk/grub2/conf/i386-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/i386-ieee1275.rmk 2009-07-01 01:04:12 UTC (rev 2376)
+++ trunk/grub2/conf/i386-ieee1275.rmk 2009-07-01 12:59:47 UTC (rev 2377)
@@ -21,7 +21,7 @@
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 \
Modified: trunk/grub2/conf/i386-pc.rmk
===================================================================
--- trunk/grub2/conf/i386-pc.rmk 2009-07-01 01:04:12 UTC (rev 2376)
+++ trunk/grub2/conf/i386-pc.rmk 2009-07-01 12:59:47 UTC (rev 2377)
@@ -53,7 +53,7 @@
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 \
Modified: trunk/grub2/conf/i386.rmk
===================================================================
--- trunk/grub2/conf/i386.rmk 2009-07-01 01:04:12 UTC (rev 2376)
+++ trunk/grub2/conf/i386.rmk 2009-07-01 12:59:47 UTC (rev 2377)
@@ -14,9 +14,3 @@
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)
Modified: trunk/grub2/conf/powerpc-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/powerpc-ieee1275.rmk 2009-07-01 01:04:12 UTC (rev 2376)
+++ trunk/grub2/conf/powerpc-ieee1275.rmk 2009-07-01 12:59:47 UTC (rev 2377)
@@ -92,9 +92,9 @@
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_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
Modified: trunk/grub2/conf/sparc64-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/sparc64-ieee1275.rmk 2009-07-01 01:04:12 UTC (rev 2376)
+++ trunk/grub2/conf/sparc64-ieee1275.rmk 2009-07-01 12:59:47 UTC (rev 2377)
@@ -43,9 +43,9 @@
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_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
Modified: trunk/grub2/conf/x86_64-efi.rmk
===================================================================
--- trunk/grub2/conf/x86_64-efi.rmk 2009-07-01 01:04:12 UTC (rev 2376)
+++ trunk/grub2/conf/x86_64-efi.rmk 2009-07-01 12:59:47 UTC (rev 2377)
@@ -90,7 +90,7 @@
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_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