Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-28 10:10:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Missing part of previous commit

Browse Source
This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2010-09-21 01:40:25 +02:00
1 parent 8f2b956726
commit b915f0e9b0
3 files changed
+7 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ChangeLog
+4
View File
@@ -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> 2010-04-09 Vladimir Serbinenko <phcoder@gmail.com>
* doc/multiboot.texi (Memory map): Add a remark about type 1. * doc/multiboot.texi (Memory map): Add a remark about type 1.
configure.ac
+1 -1
View File
@@ -42,7 +42,7 @@ dnl Because recent automake complains about CCASFLAGS, set it here.
CCASFLAGS='$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)' CCASFLAGS='$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)'
AC_SUBST(CCASFLAGS) AC_SUBST(CCASFLAGS)
CFLAGS="-m32 -nostdlib $CFLAGS" CFLAGS="-nostdlib $CFLAGS"
dnl Output. dnl Output.
AC_CONFIG_FILES([Makefile doc/Makefile]) AC_CONFIG_FILES([Makefile doc/Makefile])
doc/Makefile.am
+2 -2
View File
@@ -1,5 +1,5 @@
info_TEXINFOS = multiboot.texi 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 multiboot_TEXINFOS = boot.S.texi kernel.c.texi multiboot2.h.texi
SRC2TEXI = src2texi SRC2TEXI = src2texi
noinst_SCRIPTS = $(SRC2TEXI) noinst_SCRIPTS = $(SRC2TEXI)
@@ -12,7 +12,7 @@ noinst_PROGRAMS = kernel
kernel_SOURCES = $(EXAMPLES) kernel_SOURCES = $(EXAMPLES)
kernel_CFLAGS = -fno-builtin -nostdinc -O -g -Wall \ kernel_CFLAGS = -fno-builtin -nostdinc -O -g -Wall \
-imacros $(top_builddir)/config.h -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 boot.o: multiboot2.h
endif endif