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.

diff --git a/ChangeLog b/ChangeLog
index 0053575cb609e8f3b45d5937a3ebedc05c859c88..cf230ba258dbcaf0bef48149b851c48908dc8ccb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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'

diff --git a/conf/common.rmk b/conf/common.rmk
index fbca2e4beb5c1176cc4f02633c5892d4ca562500..9cd4b93a4ea8d4684ae614dff7c373d627be29e9 100644 (file)
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -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)

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 119e116da1ad7b0a95b2c6896db79c9d8766f613..fb65322fce70bfbcacca274aece629e26d2d631b 100644 (file)
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -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 \

diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index d1467338278770011c16d87218d9a6d8d3d80f38..4e898068d4b989cef89a9ff22e46150742a6c898 100644 (file)
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -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 \

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 5024dad5039039a31921f2f3a4dfd7bc1916d105..a7b8e07f8731d80851e228f3374aeb66b108b292 100644 (file)
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -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 \

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 714e8172dd87b20e7c5d91e14973ea254764cfd0..6ae167c6d4a53f25cc9c44d63f2ab2ab015e048d 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -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 \

diff --git a/conf/i386.rmk b/conf/i386.rmk
index 89496aef81ab9e3e2a29c2905fb7c49034da534a..93f84ce39cf45714413befdd26c98182a1e05798 100644 (file)
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -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)

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index bc672ac25ad0d676343a1f73807174659be92fc0..b424b0a3c5de40eb94cebb0bb4635605ca7c6673 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -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

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 2a05f23dfd8b30627088f95f4750726638b70375..4a2fb6698fef8ad331ea6a82e04e76356bcbee2d 100644 (file)
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -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

diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 82d000506ff4e8f73513ece86a9322734742e103..95e5ac610e757044a1d12976bf0fd6272a4099b9 100644 (file)
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -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