[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.

diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
index 9cf2bd6..1ca7734 100644 (file)
--- 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 (file)
index 0000000..da0e6ae
--- /dev/null
+++ b/src/arch/i386/prefix/unnrv2b16.S
@@ -0,0 +1,7 @@
+/*
+ * 16-bit version of the decompressor
+ *
+ */
+
+#define CODE16
+#include "unnrv2b.S"