Missing part of previous commit

diff --git a/ChangeLog b/ChangeLog
index cebabffac4a509d3a3149010b4a823f20690d24c..dc4a389d080eb8c4a0437630d72258f1bfb701fd 100644 (file)
--- 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 a7eda808ddc1d1c0fe6575b6c94277d5ab0e746f..b11961d61a7436f0062aaea785b595b96a9e9097 100644 (file)
--- 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 4493f85f44704c7e201d111f1a552c408fcead01..2a5afd95d74219bfece2f88dfe5e58579448a143 100644 (file)
--- 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