Share common compilation flags

diff --git a/Makefile.in b/Makefile.in
index 7af2df1f00d221c11c301a8c8bef6f55b051cbc6..c4059e58ecf4b35da11088b9807a3c7e211f664d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -84,8 +84,8 @@ LDFLAGS = @LDFLAGS@ $(LIBS)
 CPPFLAGS = @CPPFLAGS@ -I$(builddir) -I$(builddir)/include -I$(srcdir)/gnulib -I$(srcdir)/include -Wall -W \
         -DGRUB_LIBDIR=\"$(pkglibdir)\" -DLOCALEDIR=\"$(localedir)\"
 TARGET_CC = @TARGET_CC@
-TARGET_CFLAGS = @TARGET_CFLAGS@
-TARGET_ASFLAGS = @TARGET_ASFLAGS@
+TARGET_CFLAGS = -ffreestanding @TARGET_CFLAGS@
+TARGET_ASFLAGS = -nostdinc -fno-builtin @TARGET_ASFLAGS@
 TARGET_MODULE_FORMAT = @TARGET_MODULE_FORMAT@
 TARGET_APPLE_CC = @TARGET_APPLE_CC@
 OBJCONV = @OBJCONV@
@@ -93,9 +93,9 @@ TARGET_CPPFLAGS = @TARGET_CPPFLAGS@ -I$(srcdir)/include -I$(builddir) -I$(buildd
 ifneq ($(platform), emu)
 TARGET_CPPFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include)
 endif
-TARGET_LDFLAGS = @TARGET_LDFLAGS@
+TARGET_LDFLAGS = -nostdlib @TARGET_LDFLAGS@
 TARGET_IMG_LDSCRIPT = @TARGET_IMG_LDSCRIPT@
-TARGET_IMG_LDFLAGS = @TARGET_IMG_LDFLAGS@
+TARGET_IMG_LDFLAGS = -nostdlib @TARGET_IMG_LDFLAGS@
 TARGET_IMG_CFLAGS = @TARGET_IMG_CFLAGS@
 TARGET_OBJ2ELF = @TARGET_OBJ2ELF@
 EXEEXT = @EXEEXT@

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 95f44844c66602a06153757eae2c1a972d284fae..c06e7758a69fdb628fe3f99d6f1bb51753d81dde 100644 (file)
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -1,6 +1,5 @@
 # -*- makefile -*-
 
-COMMON_LDFLAGS += -nostdlib
 COMMON_CFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include) -fno-builtin
 
 util/grub-emu.c_DEPENDENCIES = grub_emu_init.h

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 048356a53e99d17bacc71882ba608c04b7841ae6..3cef9313fa566e8f3a72a0b8f934593882d3f3f1 100644 (file)
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -1,8 +1,6 @@
 # -*- makefile -*-
 
-COMMON_ASFLAGS = -nostdinc -fno-builtin -m32
-COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
-COMMON_LDFLAGS = -m32 -nostdlib
+COMMON_CFLAGS = -mrtd -mregparm=3 
 
 # Images.
 

diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index b6e6821f43da811dca29d581b337d5ad8f36c839..a92cff2240fde000014c7ac49377027b5ace4890 100644 (file)
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -1,7 +1,5 @@
 # -*- makefile -*-
 
-COMMON_ASFLAGS = -nostdinc -fno-builtin -m32
-COMMON_CFLAGS = -fno-builtin -m32
-COMMON_LDFLAGS = -melf_i386 -nostdlib
+COMMON_LDFLAGS = -melf_i386
 
 include $(srcdir)/conf/x86-efi.mk
\ No newline at end of file

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index c65e2f7defc4205b20d8021f6f1befb06b95977e..d4a459b3e82ba5dbf31f3ca9816d2de1c9756003 100644 (file)
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -1,8 +1,6 @@
 # -*- makefile -*-
 
-COMMON_ASFLAGS = -m32 -nostdinc -fno-builtin
-COMMON_CFLAGS  = -ffreestanding -mrtd -mregparm=3
-COMMON_LDFLAGS = -nostdlib
+COMMON_CFLAGS  = -mrtd -mregparm=3
 
 # Images.
 pkglib_PROGRAMS = kernel.img

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 57904b265609b1d7ba4a4655728f78b67fe8b4e8..19c9965439f2f4fdac7866ddeac727294c3cbd7e 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -2,9 +2,7 @@
 
 GRUB_KERNEL_MACHINE_LINK_ADDR = 0x8200
 
-COMMON_ASFLAGS = -nostdinc -fno-builtin -m32
-COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
-COMMON_LDFLAGS = -m32 -nostdlib
+COMMON_CFLAGS = -mrtd -mregparm=3
 
 # Images.
 pkglib_IMAGES = boot.img cdboot.img diskboot.img kernel.img lnxboot.img \

diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index c7209f348ed8e4b6c13580212a7f7cc113b35170..97273e1ce7e74e2a7dfd4ccd09d51ab15a25cd32 100644 (file)
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -1,8 +1,6 @@
 # -*- makefile -*-
 
-COMMON_ASFLAGS = -nostdinc -fno-builtin -m32
-COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
-COMMON_LDFLAGS = -m32 -nostdlib
+COMMON_CFLAGS = -mrtd -mregparm=3
 
 # Images.
 

diff --git a/conf/mips.rmk b/conf/mips.rmk
index 84eed880594ce3adaf0cc98ae541ef834f7b53a2..b43edbf698e61184961e45d6f364b87567319727 100644 (file)
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -1,9 +1,7 @@
 
 # -*- makefile -*-
 
-COMMON_ASFLAGS += -nostdinc
-COMMON_CFLAGS += -ffreestanding -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
-COMMON_LDFLAGS += -nostdlib
+COMMON_CFLAGS += -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
 
 # Images.
 kernel_img_HEADERS += cpu/libgcc.h cpu/cache.h

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index e7668fc5d9a7b37c8a4b47bedc2e2fcc902e0ecc..86f6ddcb361c25b6834075a2c402e1c72015a0a0 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -1,10 +1,6 @@
 
 # -*- makefile -*-
 
-COMMON_ASFLAGS = -nostdinc
-COMMON_CFLAGS = -ffreestanding
-COMMON_LDFLAGS += -nostdlib
-
 # Images.
 
 kernel_img_HEADERS += cpu/libgcc.h ieee1275/ieee1275.h

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index ffa8c1e7c062c669c96850bceb444fc93cec4676..507a05ab9f18836634d8bc0bbf0753657b612723 100644 (file)
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -1,9 +1,8 @@
 
 # -*- makefile -*-
 
-COMMON_ASFLAGS = -nostdinc -m64
-COMMON_CFLAGS = -ffreestanding -m64 -mno-app-regs
-COMMON_LDFLAGS = -melf64_sparc -nostdlib -mno-relax
+COMMON_CFLAGS = -mno-app-regs
+COMMON_LDFLAGS = -melf64_sparc -mno-relax
 
 # Images.
 pkglib_IMAGES = boot.img diskboot.img kernel.img
@@ -37,7 +36,7 @@ kernel_img_SOURCES = kern/sparc64/ieee1275/crt0.S kern/ieee1275/cmain.c       \
        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
+kernel_img_LDFLAGS = -Wl,-N,-Ttext,0x200000,-Bstatic,-melf64_sparc -static-libgcc -lgcc
 kernel_img_FORMAT = binary
 
 # Utilities.

diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 816cce34e22c3975d65edf8f723b8d4ade58a0c3..200621280cb0908ed15ea81a9fa6c20bed906ce8 100644 (file)
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -1,7 +1,5 @@
 # -*- makefile -*-
 
-COMMON_ASFLAGS = -nostdinc -fno-builtin -m64
-COMMON_CFLAGS = -fno-builtin -m64
-COMMON_LDFLAGS = -melf_x86_64 -nostdlib
+COMMON_LDFLAGS = -melf_x86_64
 
 include $(srcdir)/conf/x86-efi.mk

diff --git a/configure.ac b/configure.ac
index f3fcd8c48354b8e5b8f0a99bf4902f0a3ef387f0..462fca2258c14d6a407ee23289667521795b6fcc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -353,6 +353,7 @@ AC_MSG_RESULT([$TARGET_OBJ2ELF])
 if test "x$target_m32" = x1; then
   # Force 32-bit mode.
   TARGET_CFLAGS="$TARGET_CFLAGS -m32"
+  TARGET_ASFLAGS="$TARGET_CFLAGS -m32"
   TARGET_LDFLAGS="$TARGET_LDFLAGS -m32"
   TARGET_MODULE_FORMAT="elf32"
 fi
@@ -360,6 +361,7 @@ fi
 if test "x$target_m64" = x1; then
   # Force 64-bit mode.
   TARGET_CFLAGS="$TARGET_CFLAGS -m64"
+  TARGET_ASFLAGS="$TARGET_ASFLAGS -m64"
   TARGET_LDFLAGS="$TARGET_LDFLAGS -m64"
   TARGET_MODULE_FORMAT="elf64"
 fi