use $(target_cpu) in conf/*.rmk
PATCH 1/1 use $(target_cpu) in conf/*.rmk
This patch replaces a few hardcoded architecture names in conf/*.rmk with $(target_cpu). It makes it easier to share code.
As a result of this, the setjmp module declarations are unified.
grub-emu can too be unified similarly, although util/$(target_cpu)/$(platform)/misc.c might be better off with a complete merge (they're always identical, or almost).
Signature · 5 lines
Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all."
2009-06-29 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.
common.rmk +5 -0
@@ -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)
i386-pc.rmk +1 -1
@@ -53,7 +53,7 @@ kernel_img_SOURCES = kern/i386/pc/startu 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 \
i386.rmk +0 -6
@@ -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)
i386-efi.rmk +1 -1
@@ -92,7 +92,7 @@ kernel_mod_SOURCES = kern/i386/efi/start 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 \
i386-ieee1275.rmk +1 -1
@@ -21,7 +21,7 @@ kernel_img_SOURCES = kern/i386/ieee1275/ 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 \
x86_64-efi.rmk +1 -7
@@ -90,7 +90,7 @@ kernel_mod_SOURCES = kern/x86_64/efi/sta 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
powerpc-ieee1275.rmk +2 -8
@@ -92,9 +92,9 @@ kernel_img_SOURCES = kern/powerpc/ieee12 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
i386-coreboot.rmk +2 -2
@@ -23,7 +23,7 @@ kernel_img_SOURCES = kern/i386/coreboot/ 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/star 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 \
sparc64-ieee1275.rmk +2 -8
@@ -43,9 +43,9 @@ kernel_img_SOURCES = kern/sparc64/ieee12 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
Quoting Robert Millan <[email protected]>:
Quoted 9 lines
This patch replaces a few hardcoded architecture names in conf/*.rmk with $(target_cpu). It makes it easier to share code.
As a result of this, the setjmp module declarations are unified.
grub-emu can too be unified similarly, although util/$(target_cpu)/$(platform)/misc.c might be better off with a complete merge (they're always identical,
or almost).
Fine with me.
I'm actually thinking of making dl.c similar to each other by using the notation without "32" and "64". At least it would be easier to compare them.
Signature · 2 lines
Regards, Pavel Roskin
Quoted 6 lines · Pavel Roskin
Quoting Robert Millan <[email protected]>:
Quoted 4 lines
This patch replaces a few hardcoded architecture names in conf/*.rmk with $(target_cpu). It makes it easier to share code.
Quoted 8 lines
Quoted 6 lines
As a result of this, the setjmp module declarations are unified.
grub-emu can too be unified similarly, although util/$(target_cpu)/$(platform)/misc.c
might be better off with a complete merge (they're always identical, or almost).Fine with me.
Committed.
Quoted 3 lines
I'm actually thinking of making
dl.csimilar to each other by using the notation without "32" and "64". At least it would be easier to compare them.
Yeah, I was thinking that too.
Signature · 5 lines
Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all."
Quoted 5 lines · Robert Millan
Quoted 3 lines
I'm actually thinking of making
dl.csimilar to each other by using the notation without "32" and "64". At least it would be easier to compare them.Yeah, I was thinking that too.
Committed :-)
Signature · 2 lines
Regards, Pavel Roskin