diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | com32/libutil/Makefile | 3 | ||||
| -rw-r--r-- | com32/modules/Makefile | 3 | ||||
| -rw-r--r-- | com32/samples/Makefile | 3 | ||||
| -rw-r--r-- | memdisk/Makefile | 7 | ||||
| -rw-r--r-- | menu/Makefile | 3 | ||||
| -rw-r--r-- | sample/Makefile | 5 |
7 files changed, 18 insertions, 11 deletions
@@ -35,6 +35,7 @@ AR = ar RANLIB = ranlib NASM = nasm +NASMOPT = -O9999 NINCLUDE = BINDIR = /usr/bin SBINDIR = /sbin @@ -142,7 +143,7 @@ kwdhash.gen: keywords genhash.pl # Standard rule for {ldlinux,pxelinux,isolinux,isolinux-debug,extlinux}.bin %.bin: %.asm kwdhash.gen version.gen - $(NASM) -O99 -f bin -DDATE_STR="'$(DATE)'" -DHEXDATE="$(HEXDATE)" \ + $(NASM) $(NASMOPT) -f bin -DDATE_STR="'$(DATE)'" -DHEXDATE="$(HEXDATE)" \ -DMAP=$(@:.bin=.map) -l $(@:.bin=.lsr) -o $@ $< $(PERL) lstadjust.pl $(@:.bin=.lsr) $(@:.bin=.map) $(@:.bin=.lst) $(PERL) checkov.pl $(@:.bin=.map) $@ @@ -166,7 +167,7 @@ mbr_bin.c: mbr/mbr.bin bin2c.pl $(PERL) bin2c.pl syslinux_mbr < $< > $@ copybs.com: copybs.asm - $(NASM) -O99 -f bin -l copybs.lst -o copybs.com copybs.asm + $(NASM) $(NASMOPT) -f bin -l copybs.lst -o copybs.com copybs.asm bootsect_bin.c: ldlinux.bss bin2c.pl $(PERL) bin2c.pl syslinux_bootsect < $< > $@ diff --git a/com32/libutil/Makefile b/com32/libutil/Makefile index 1e5c7bcf..df5843e3 100644 --- a/com32/libutil/Makefile +++ b/com32/libutil/Makefile @@ -1,6 +1,6 @@ ## ----------------------------------------------------------------------- ## -## Copyright 2001-2004 H. Peter Anvin - All Rights Reserved +## Copyright 2001-2007 H. Peter Anvin - All Rights Reserved ## ## Permission is hereby granted, free of charge, to any person ## obtaining a copy of this software and associated documentation @@ -40,6 +40,7 @@ CC = gcc LD = ld -m elf_i386 AR = ar NASM = nasm +NASMOPT = -O9999 RANLIB = ranlib CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -march=i386 -Os -fomit-frame-pointer -I./include -I../include SFLAGS = $(M32) -D__COM32__ -march=i386 diff --git a/com32/modules/Makefile b/com32/modules/Makefile index 933987e2..7910020e 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -1,6 +1,6 @@ ## ----------------------------------------------------------------------- ## -## Copyright 2001-2006 H. Peter Anvin - All Rights Reserved +## Copyright 2001-2007 H. Peter Anvin - All Rights Reserved ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -25,6 +25,7 @@ CC = gcc LD = ld -m elf_i386 AR = ar NASM = nasm +NASMOPT = -O9999 RANLIB = ranlib CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__ LNXCFLAGS = -W -Wall -O -g -I../libutil/include diff --git a/com32/samples/Makefile b/com32/samples/Makefile index 5ac2aad3..e14e08f1 100644 --- a/com32/samples/Makefile +++ b/com32/samples/Makefile @@ -1,6 +1,6 @@ ## ----------------------------------------------------------------------- ## -## Copyright 2001-2004 H. Peter Anvin - All Rights Reserved +## Copyright 2001-2007 H. Peter Anvin - All Rights Reserved ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -25,6 +25,7 @@ CC = gcc LD = ld -m elf_i386 AR = ar NASM = nasm +NASMOPT = -O9999 RANLIB = ranlib CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__ LNXCFLAGS = -W -Wall -O -g -I../libutil/include diff --git a/memdisk/Makefile b/memdisk/Makefile index 2aa29f4f..173ef2be 100644 --- a/memdisk/Makefile +++ b/memdisk/Makefile @@ -30,7 +30,8 @@ LDFLAGS = $(M32) -g INCLUDE = -I../com32/include LD = ld -m elf_i386 NASM = nasm -NFLAGS = -O99 -dVERSION='"$(VERSION)"' -dDATE='"$(DATE)"' -dWITH_EDD +NASMOPT = -O9999 +NFLAGS = -dVERSION='"$(VERSION)"' -dDATE='"$(DATE)"' -dWITH_EDD NINCLUDE = OBJCOPY = objcopy PERL = perl @@ -57,7 +58,7 @@ spotless: clean rm -f memdisk .depend %.o: %.asm - $(NASM) $(NFLAGS) -f elf -l $*.lst -o $@ $< + $(NASM) $(NASMOPT) $(NFLAGS) $(NINCLUDE) -f elf -l $*.lst -o $@ $< %.o: %.s $(CC) $(SFLAGS) -c -o $@ $< @@ -90,7 +91,7 @@ spotless: clean %.o: %.c %.bin: %.asm - $(NASM) -f bin $(NFLAGS) $(NINCLUDE) -o $@ -l $*.lst $< + $(NASM) -f bin $(NASMOPT) $(NFLAGS) $(NINCLUDE) -o $@ -l $*.lst $< memdisk16.elf: $(OBJS16) $(LD) -Ttext 0 -o $@ $^ diff --git a/menu/Makefile b/menu/Makefile index 702f4563..b3276310 100644 --- a/menu/Makefile +++ b/menu/Makefile @@ -1,6 +1,6 @@ ## ----------------------------------------------------------------------- ## -## Copyright 2001-2005 H. Peter Anvin - All Rights Reserved +## Copyright 2001-2007 H. Peter Anvin - All Rights Reserved ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -25,6 +25,7 @@ CC = gcc LD = ld -m elf_i386 AR = ar NASM = nasm +NASMOPT = -O9999 RANLIB = ranlib COM32DIR = ../com32 LUDIR = $(COM32DIR)/libutil diff --git a/sample/Makefile b/sample/Makefile index 22573e63..9ad85409 100644 --- a/sample/Makefile +++ b/sample/Makefile @@ -1,6 +1,6 @@ ## ----------------------------------------------------------------------- ## -## Copyright 2001-2004 H. Peter Anvin - All Rights Reserved +## Copyright 2001-2007 H. Peter Anvin - All Rights Reserved ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -25,6 +25,7 @@ CC = gcc LD = ld -m elf_i386 AR = ar NASM = nasm +NASMOPT = -O9999 RANLIB = ranlib CFLAGS = $(M32) -W -Wall -march=i386 -Os -fomit-frame-pointer -I../com32/include SFLAGS = $(M32) -march=i386 @@ -56,7 +57,7 @@ all: syslogo.lss comecho.com hello.c32 hello2.c32 filetest.c32 c32echo.c32 \ $(OBJCOPY) -O binary $< $@ %.com: %.asm - $(NASM) -O99 -f bin -o $@ -l $*.lst $< + $(NASM) $(NASMOPT) -f bin -o $@ -l $*.lst $< $(LIB): $(LIBOBJS) rm -f $@ |