vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2003-09-25 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
* genmk.rb (PModule#rule): Make sure to get only symbol names
	from the output of nm.
	Reported by Robert Millan <zeratul2@wanadoo.es>.
This commit is contained in:
okuji 2003-09-25 20:29:32 +00:00
parent 18d9c7cd53
commit 98d150633e
5 changed files with 923 additions and 581 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2003-09-25 Yoshinori K. Okuji <okuji@enbug.org>
* genmk.rb (PModule#rule): Make sure to get only symbol names
from the output of nm.
Reported by Robert Millan <zeratul2@wanadoo.es>.
2003-09-25 Yoshinori K. Okuji <okuji@enbug.org>
I forgot to check in these changes for a long time. This adds

14
conf/i386-pc.mk
View file

@ -424,7 +424,7 @@ def-_chain.lst: pre-_chain.o
und-_chain.lst: pre-_chain.o
echo '_chain' > $@
$(NM) -u -P -p $< >> $@
$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
_chain_mod-loader_i386_pc_chainloader.o: loader/i386/pc/chainloader.c
$(CC) -Iloader/i386/pc -I$(srcdir)/loader/i386/pc $(CPPFLAGS) $(CFLAGS) $(_chain_mod_CFLAGS) -c -o $@ $<
@ -463,7 +463,7 @@ def-fat.lst: pre-fat.o
und-fat.lst: pre-fat.o
echo 'fat' > $@
$(NM) -u -P -p $< >> $@
$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
fat_mod-fs_fat.o: fs/fat.c
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fat_mod_CFLAGS) -c -o $@ $<
@ -502,7 +502,7 @@ def-_linux.lst: pre-_linux.o
und-_linux.lst: pre-_linux.o
echo '_linux' > $@
$(NM) -u -P -p $< >> $@
$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
_linux_mod-loader_i386_pc_linux.o: loader/i386/pc/linux.c
$(CC) -Iloader/i386/pc -I$(srcdir)/loader/i386/pc $(CPPFLAGS) $(CFLAGS) $(_linux_mod_CFLAGS) -c -o $@ $<
@ -542,7 +542,7 @@ def-normal.lst: pre-normal.o
und-normal.lst: pre-normal.o
echo 'normal' > $@
$(NM) -u -P -p $< >> $@
$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
normal_mod-normal_cmdline.o: normal/cmdline.c
$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -c -o $@ $<
@ -614,7 +614,7 @@ def-hello.lst: pre-hello.o
und-hello.lst: pre-hello.o
echo 'hello' > $@
$(NM) -u -P -p $< >> $@
$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
hello_mod-hello_hello.o: hello/hello.c
$(CC) -Ihello -I$(srcdir)/hello $(CPPFLAGS) $(CFLAGS) $(hello_mod_CFLAGS) -c -o $@ $<
@ -653,7 +653,7 @@ def-vga.lst: pre-vga.o
und-vga.lst: pre-vga.o
echo 'vga' > $@
$(NM) -u -P -p $< >> $@
$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
vga_mod-term_i386_pc_vga.o: term/i386/pc/vga.c
$(CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc $(CPPFLAGS) $(CFLAGS) $(vga_mod_CFLAGS) -c -o $@ $<
@ -692,7 +692,7 @@ def-font.lst: pre-font.o
und-font.lst: pre-font.o
echo 'font' > $@
$(NM) -u -P -p $< >> $@
$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
font_mod-font_manager.o: font/manager.c
$(CC) -Ifont -I$(srcdir)/font $(CPPFLAGS) $(CFLAGS) $(font_mod_CFLAGS) -c -o $@ $<

4
config.h.in
View file

@ -4,13 +4,13 @@
prefixed with an asterisk */
#undef ABSOLUTE_WITHOUT_ASTERISK
/* Define it to "addr32" or "addr32;" to make GAS happy */
/* Define it to \"addr32\" or \"addr32;\" to make GAS happy */
#undef ADDR32
/* Define it to one of __bss_start, edata and _edata */
#undef BSS_START_SYMBOL
/* Define it to "data32" or "data32;" to make GAS happy */
/* Define it to \"data32\" or \"data32;\" to make GAS happy */
#undef DATA32
/* Define it to either end or _end */

1478
configure vendored
View file

File diff suppressed because it is too large Load diff

2
genmk.rb
View file

@ -135,7 +135,7 @@ UNDSYMFILES += #{undsym}
#{undsym}: #{pre_obj}
echo '#{mod_name}' > $@
$(NM) -u -P -p $< >> $@
$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
" + objs.collect_with_index do |obj, i|
src = sources[i]