summaryrefslogtreecommitdiffstats
path: root/src/arch
diff options
context:
space:
mode:
authorMichael Brown2009-04-17 14:38:18 +0200
committerMichael Brown2009-04-17 14:38:18 +0200
commita63ef9207dfad65507f8dfeea643b0f8354f4741 (patch)
tree0fd6a113e8cb8f549aeafc9a338f5e715804bcc1 /src/arch
parent[build] Provide mechanism for listing per-target source files (diff)
downloadipxe-a63ef9207dfad65507f8dfeea643b0f8354f4741.tar.gz
ipxe-a63ef9207dfad65507f8dfeea643b0f8354f4741.tar.xz
ipxe-a63ef9207dfad65507f8dfeea643b0f8354f4741.zip
[build] Kill off the last multiple-object source file
The build mechanism currently allows for multiple objects per source file. The only remaining user of this is unnrv2b.S. Replace this usage with a separate unnrv2b16.S wrapper file, as is currently used for e.g. pxeprefix.S and kpxeprefix.S.
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/i386/Makefile5
-rw-r--r--src/arch/i386/prefix/unnrv2b16.S7
2 files changed, 7 insertions, 5 deletions
diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
index 9cf2bd69..1ca77347 100644
--- a/src/arch/i386/Makefile
+++ b/src/arch/i386/Makefile
@@ -89,11 +89,6 @@ NON_AUTO_SRCS += arch/i386/core/aout_loader.c
NON_AUTO_SRCS += arch/i386/core/freebsd_loader.c
NON_AUTO_SRCS += arch/i386/core/wince_loader.c
-# unnrv2b.S is used to generate a 16-bit as well as a 32-bit object.
-#
-OBJS_unnrv2b = unnrv2b unnrv2b16
-CFLAGS_unnrv2b16 = -DCODE16
-
# Include common x86 Makefile
#
MAKEDEPS += arch/x86/Makefile
diff --git a/src/arch/i386/prefix/unnrv2b16.S b/src/arch/i386/prefix/unnrv2b16.S
new file mode 100644
index 00000000..da0e6ae8
--- /dev/null
+++ b/src/arch/i386/prefix/unnrv2b16.S
@@ -0,0 +1,7 @@
+/*
+ * 16-bit version of the decompressor
+ *
+ */
+
+#define CODE16
+#include "unnrv2b.S"