From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UXs4A-0007IJ-Ll for mharc-grub-devel@gnu.org; Thu, 02 May 2013 07:52:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXs43-0007HQ-5H for grub-devel@gnu.org; Thu, 02 May 2013 07:52:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UXs41-0004Zf-MC for grub-devel@gnu.org; Thu, 02 May 2013 07:52:43 -0400 Received: from mail-la0-x233.google.com ([2a00:1450:4010:c03::233]:51357) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXs41-0004ZI-FE for grub-devel@gnu.org; Thu, 02 May 2013 07:52:41 -0400 Received: by mail-la0-f51.google.com with SMTP id ep20so423578lab.10 for ; Thu, 02 May 2013 04:52:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer; bh=YHkBRnjmiaFN1qQKfMC5qUspbs4a1zGundFZ03gjdYo=; b=P9ZaOuTh7cBBA0gdNmbVzvwDdT8rC1SUDguSTMfn1o3JI8ONwqx0agvtc07p8ahGiz zxl62BRpzDGZAQWoID99MJo352uSo7zxN2bqj/tYqgLITQThFbDurh/JBkG5XCUA58rY 8C4ir3pM9SEA26WaA5hsRel/ja5jyN9WdPKqo0vd/061vF4yKQzAUYm1wisrS9CBeYoZ 8lFazBZ3ysisqM4cfgRz8N+m5i0yX9W44OIOw+6NQKuOCbLnupNZtDUDudN6LVCBSeKe HN0kP/1Xjx+zurerFw4hLMNuPgUCagul0hAKmFsW5BBZobxCtcm/h4DeOTyWIncoLg7G 474g== X-Received: by 10.112.146.133 with SMTP id tc5mr2514210lbb.88.1367495560241; Thu, 02 May 2013 04:52:40 -0700 (PDT) Received: from localhost.localdomain ([94.29.72.160]) by mx.google.com with ESMTPSA id t20sm2637145lbi.5.2013.05.02.04.52.39 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 May 2013 04:52:39 -0700 (PDT) From: Andrey Borzenkov To: grub-devel@gnu.org Subject: [PATCH] define rs_decoder.S and sm712_start.S as nodist header files Date: Thu, 2 May 2013 15:52:33 +0400 Message-Id: <1367495553-19655-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 1.8.1.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::233 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 May 2013 11:52:48 -0000 The first fixes "make dist" on 64 bit EFI: make[2]: Entering directory `/home/bor/build/grub/grub-core' gcc -Wall -W -I../include -I../include -DGRUB_MACHINE_EFI=1 -DGRUB_MACHINE=X86_64_EFI -DGRUB_TARGET_CPU_X86_64=1 -m64 ... -Wtrampolines -DUSE_ASCII_FAILBACK=1 -DHAVE_UNIFONT_WIDTHSPEC=1 -Os -I.. -S -DSTANDALONE -o rs_decoder.S lib/reed_solomon.c -g0 -mregparm=3 -ffreestanding lib/reed_solomon.c:1:0: error: -mregparm is ignored in 64-bit mode [-Werror] cc1: all warnings being treated as errors make[2]: *** [rs_decoder.S] Error 1 make[2]: Leaving directory `/home/bor/build/grub/grub-core' make[1]: *** [distdir] Error 1 make[1]: Leaving directory `/home/bor/build/grub' make: *** [dist] Error 2 Add rs_decoder.S as NODIST header to kernel to avoid triggering rebuild on "make dist". As it should not be compiled on its own, but included, rename it into rs_decoder.h, so automake does the right thing. For consistency do the same with sm712_start.S which is not required during "make dist" as well. Signed-off-by: Andrey Borzenkov --- grub-core/Makefile.am | 9 +++------ grub-core/Makefile.core.def | 2 ++ grub-core/boot/i386/pc/startup_raw.S | 2 +- grub-core/boot/mips/loongson/fwstart.S | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am index fa6afcf..6d810e9 100644 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am @@ -45,9 +45,9 @@ gensm712: video/sm712.c CLEANFILES += gensm712 # trigtables.c -sm712_start.S: gensm712 video/sm712.c $(top_srcdir)/configure.ac +sm712_start.h: gensm712 video/sm712.c $(top_srcdir)/configure.ac $(builddir)/gensm712 > $@ -CLEANFILES += sm712_start.S +CLEANFILES += sm712_start.h # XXX Use Automake's LEX & YACC support grub_script.tab.h: script/parser.y @@ -60,12 +60,9 @@ grub_script.yy.h: script/yylex.l $(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $< grub_script.yy.c: grub_script.yy.h -rs_decoder.S: $(srcdir)/lib/reed_solomon.c +rs_decoder.h: $(srcdir)/lib/reed_solomon.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Os -I$(top_builddir) -S -DSTANDALONE -o $@ $< -g0 -mregparm=3 -ffreestanding -boot/i386/pc/startup_raw.S: $(builddir)/rs_decoder.S -boot/mips/loongson/fwstart.S: $(builddir)/sm712_start.S - CLEANFILES += grub_script.yy.c grub_script.yy.h include $(srcdir)/Makefile.core.am diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index 7e19acb..0715971 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -396,6 +396,7 @@ image = { image = { name = lzma_decompress; i386_pc = boot/i386/pc/startup_raw.S; + i386_pc_nodist = rs_decoder.h; objcopyflags = '-O binary'; ldflags = '$(TARGET_IMG_LDFLAGS) $(TARGET_IMG_BASE_LDOPT),0x8200'; @@ -405,6 +406,7 @@ image = { image = { name = fwstart; mips_loongson = boot/mips/loongson/fwstart.S; + mips_loongson_nodist = sm712_start.h; objcopyflags = '-O binary'; ldflags = '-static-libgcc -lgcc -Wl,-N,-S,-Ttext,0xbfc00000,-Bstatic'; enable = mips_loongson; diff --git a/grub-core/boot/i386/pc/startup_raw.S b/grub-core/boot/i386/pc/startup_raw.S index 81c0bc4..06dec8c 100644 --- a/grub-core/boot/i386/pc/startup_raw.S +++ b/grub-core/boot/i386/pc/startup_raw.S @@ -119,7 +119,7 @@ LOCAL (codestart): #include "../../../kern/i386/realmode.S" -#include +#include .text diff --git a/grub-core/boot/mips/loongson/fwstart.S b/grub-core/boot/mips/loongson/fwstart.S index ec57be6..11ad1c9 100644 --- a/grub-core/boot/mips/loongson/fwstart.S +++ b/grub-core/boot/mips/loongson/fwstart.S @@ -886,7 +886,7 @@ table_cont: b init_end nop init_table: -#include "sm712_start.S" +#include "sm712_start.h" init_table_end: .align 4 init_end: -- tg: (93daf86..) u/startup_raw_nodist (depends on: master)