Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MLGbN-0004vz-30 for mharc-grub-devel@gnu.org; Mon, 29 Jun 2009 09:08:53 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MLGbL-0004uq-6O for grub-devel@gnu.org; Mon, 29 Jun 2009 09:08:51 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MLGbG-0004rX-1e for grub-devel@gnu.org; Mon, 29 Jun 2009 09:08:50 -0400 Received: from [199.232.76.173] (port=43058 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MLGbF-0004rT-Ug for grub-devel@gnu.org; Mon, 29 Jun 2009 09:08:46 -0400 Received: from aybabtu.com ([69.60.117.155]:48820) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MLGbF-0007dv-Di for grub-devel@gnu.org; Mon, 29 Jun 2009 09:08:45 -0400 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1MLFXa-0002tT-Cm for grub-devel@gnu.org; Mon, 29 Jun 2009 14:00:55 +0200 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1MLGbA-00032c-Vj for grub-devel@gnu.org; Mon, 29 Jun 2009 15:08:40 +0200 Date: Mon, 29 Jun 2009 15:08:40 +0200 From: Robert Millan To: grub-devel@gnu.org Message-ID: <20090629130840.GA11687@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MGYHOYXEY6WxJCY8" Content-Disposition: inline Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.18 (2008-05-17) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1) Subject: [PATCH] use $(target_cpu) in conf/*.rmk X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jun 2009 13:08:51 -0000 --MGYHOYXEY6WxJCY8 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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). -- 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." --MGYHOYXEY6WxJCY8 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="vars_in_mk.diff" 2009-06-29 Robert Millan * 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. Index: conf/common.rmk =================================================================== --- conf/common.rmk (revision 2371) +++ conf/common.rmk (working copy) @@ -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) Index: conf/i386-pc.rmk =================================================================== --- conf/i386-pc.rmk (revision 2371) +++ conf/i386-pc.rmk (working copy) @@ -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 \ Index: conf/i386.rmk =================================================================== --- conf/i386.rmk (revision 2371) +++ conf/i386.rmk (working copy) @@ -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) Index: conf/i386-efi.rmk =================================================================== --- conf/i386-efi.rmk (revision 2371) +++ conf/i386-efi.rmk (working copy) @@ -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 \ Index: conf/i386-ieee1275.rmk =================================================================== --- conf/i386-ieee1275.rmk (revision 2371) +++ conf/i386-ieee1275.rmk (working copy) @@ -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 \ Index: conf/x86_64-efi.rmk =================================================================== --- conf/x86_64-efi.rmk (revision 2371) +++ conf/x86_64-efi.rmk (working copy) @@ -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 Index: conf/powerpc-ieee1275.rmk =================================================================== --- conf/powerpc-ieee1275.rmk (revision 2371) +++ conf/powerpc-ieee1275.rmk (working copy) @@ -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 Index: conf/i386-coreboot.rmk =================================================================== --- conf/i386-coreboot.rmk (revision 2371) +++ conf/i386-coreboot.rmk (working copy) @@ -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 \ Index: conf/sparc64-ieee1275.rmk =================================================================== --- conf/sparc64-ieee1275.rmk (revision 2371) +++ conf/sparc64-ieee1275.rmk (working copy) @@ -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 --MGYHOYXEY6WxJCY8--