From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 20 Sep 2010 23:40:25 +0000 (+0200)
Subject: Missing part of previous commit
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b915f0e9b009bacc22d63bc78f8a9bbd20acc998;p=thirdparty%2Fgrub.git

Missing part of previous commit
---

diff --git a/ChangeLog b/ChangeLog
index cebabffac..dc4a389d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* doc/multiboot.texi: Typo fix.
+
 2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* doc/multiboot.texi (Memory map): Add a remark about type 1.
diff --git a/configure.ac b/configure.ac
index a7eda808d..b11961d61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ dnl Because recent automake complains about CCASFLAGS, set it here.
 CCASFLAGS='$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)'
 AC_SUBST(CCASFLAGS)
 
-CFLAGS="-m32 -nostdlib $CFLAGS"
+CFLAGS="-nostdlib $CFLAGS"
 
 dnl Output.
 AC_CONFIG_FILES([Makefile doc/Makefile])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4493f85f4..2a5afd95d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
 info_TEXINFOS = multiboot.texi
-EXAMPLES = boot.S kernel.c multiboot2.h
+EXAMPLES = boot_mips.S kernel.c multiboot2.h
 multiboot_TEXINFOS = boot.S.texi kernel.c.texi multiboot2.h.texi
 SRC2TEXI = src2texi
 noinst_SCRIPTS = $(SRC2TEXI)
@@ -12,7 +12,7 @@ noinst_PROGRAMS = kernel
 kernel_SOURCES = $(EXAMPLES)
 kernel_CFLAGS = -fno-builtin -nostdinc -O -g -Wall \
 	-imacros $(top_builddir)/config.h
-kernel_LDFLAGS = -nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none
+kernel_LDFLAGS = -nostdlib -Wl,-N -Wl,-Ttext -Wl,80100000 -Wl,--build-id=none
 
 boot.o: multiboot2.h
 endif