aboutsummaryrefslogtreecommitdiffstats
path: root/dos
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2006-10-17 15:25:00 -0700
committerH. Peter Anvin <hpa@zytor.com>2006-10-17 15:25:00 -0700
commitf44248bc9677a6e82c700f91a72d1a798aaa097a (patch)
tree2d212cd4fba894086b997fa8ebd2f48a4fa29501 /dos
parent413b6d181f1abe16742437b56217d47567982a92 (diff)
downloadsyslinux-devel-f44248bc9677a6e82c700f91a72d1a798aaa097a.tar.gz
syslinux-devel-f44248bc9677a6e82c700f91a72d1a798aaa097a.tar.xz
syslinux-devel-f44248bc9677a6e82c700f91a72d1a798aaa097a.zip
Makefile cleanup to be able to build with CC='gcc -m32'syslinux-3.32-pre2
Diffstat (limited to 'dos')
-rw-r--r--dos/Makefile4
-rw-r--r--dos/code16.h4
2 files changed, 7 insertions, 1 deletions
diff --git a/dos/Makefile b/dos/Makefile
index 5029f4a9..61423cec 100644
--- a/dos/Makefile
+++ b/dos/Makefile
@@ -51,7 +51,9 @@ syslinux.com: syslinux.elf
$(CC) $(CFLAGS) -E -o $@ $<
%.s: %.c
$(CC) $(CFLAGS) -S -o $@ $<
+%.o: %.S
+ $(CC) -Wp,-MT,$@,-MD,.$@.d $(CFLAGS) -D__ASSEMBLY__ -c -o $@ $<
%.s: %.S
- $(CC) $(CFLAGS) -D__ASSEMBLY__ -S -o $@ $<
+ $(CC) $(CFLAGS) -E -o $@ $<
-include .*.d
diff --git a/dos/code16.h b/dos/code16.h
index ceb1600c..ca765651 100644
--- a/dos/code16.h
+++ b/dos/code16.h
@@ -1,2 +1,6 @@
/* Must be included first of all */
+#ifdef __ASSEMBLY__
+ .code16
+#else
__asm__ (".code16gcc");
+#endif