diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/devel.mk | 1 | ||||
| -rw-r--r-- | mk/lib.mk | 11 | ||||
| -rw-r--r-- | mk/syslinux.mk | 11 |
3 files changed, 14 insertions, 9 deletions
diff --git a/mk/devel.mk b/mk/devel.mk index fb4af678..e0429380 100644 --- a/mk/devel.mk +++ b/mk/devel.mk @@ -1,3 +1,4 @@ # Useful while doing development, but not for production. GCCWARN += -Wno-clobbered +#GCCWARN += -DDEBUG_MALLOC # GCCWARN += -DDEBUG_PORT=0x3f8 -DCORE_DEBUG=1 @@ -63,13 +63,13 @@ LIBOTHER_OBJS = \ lrand48.o stack.o memccpy.o memchr.o \ mempcpy.o memmem.o memmove.o memswap.o \ perror.o qsort.o seed48.o \ - srand48.o sscanf.o strcasecmp.o strcat.o \ + srand48.o sscanf.o strcasecmp.o \ strerror.o errlist.o \ strnlen.o \ strncat.o strndup.o \ stpncpy.o \ - strntoimax.o strntoumax.o strsep.o strspn.o strstr.o \ - strtoimax.o strtok.o strtol.o strtoll.o strtoul.o strtoull.o \ + strntoimax.o strsep.o strspn.o strstr.o \ + strtoimax.o strtok.o strtol.o strtoll.o strtoull.o \ strtoumax.o vprintf.o vsprintf.o \ asprintf.o vasprintf.o \ vsscanf.o \ @@ -185,11 +185,12 @@ CORELIBOBJS = \ memcpy.o memset.o memcmp.o printf.o strncmp.o vfprintf.o \ strlen.o vsnprintf.o snprintf.o stpcpy.o strcmp.o strdup.o \ strcpy.o strncpy.o setjmp.o fopen.o fread.o fread2.o puts.o \ + strtoul.o strntoumax.o \ sprintf.o strlcat.o strchr.o strlcpy.o strncasecmp.o ctypes.o \ - fputs.o fwrite2.o fwrite.o fgetc.o fclose.o errno.o lmalloc.o \ + fputs.o fwrite2.o fwrite.o fgetc.o fclose.o lmalloc.o \ sys/err_read.o sys/err_write.o sys/null_read.o \ sys/stdcon_write.o \ - syslinux/memscan.o strrchr.o \ + syslinux/memscan.o strrchr.o strcat.o \ libgcc/__ashldi3.o libgcc/__udivdi3.o \ libgcc/__negdi2.o libgcc/__ashrdi3.o libgcc/__lshrdi3.o \ libgcc/__muldi3.o libgcc/__udivmoddi4.o libgcc/__umoddi3.o \ diff --git a/mk/syslinux.mk b/mk/syslinux.mk index 484afb2a..337560bb 100644 --- a/mk/syslinux.mk +++ b/mk/syslinux.mk @@ -32,8 +32,13 @@ COM32DIR = $(AUXDIR)/com32 BOOTDIR = /boot EXTLINUXDIR = $(BOOTDIR)/extlinux +ifdef DEBUG +# This allows DEBUGOPT to be set from the command line +DEBUGOPT = -DDEBUG=$(DEBUG) +endif + NASM = nasm -NASMOPT = -Ox +NASMOPT = -Ox $(DEBUGOPT) PERL = perl PYTHON = python @@ -74,9 +79,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/) ARCH ?= $(strip $(SUBARCH)) # Common warnings we want for all gcc-generated code -GCCWARN := -W -Wall -Wstrict-prototypes -# Extremely useful variant for debugging... -#GCCWARN += -Wno-clobbered -Werror +GCCWARN = -W -Wall -Wstrict-prototypes $(DEBUGOPT) # Common stanza to make gcc generate .*.d dependency files MAKEDEPS = -Wp,-MT,$@,-MD,$(dir $@).$(notdir $@).d |