usb gadget: link fixes for serial gadget
authorDavid Brownell <dbrownell@users.sourceforge.net>
Tue, 19 Aug 2008 00:41:02 +0000 (17:41 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 16 Oct 2008 16:24:45 +0000 (09:24 -0700)
Change how the serial gadget driver builds:  don't use
separate compilation, since it works poorly when key parts
are library code (with init sections etc).  Instead be as
close as we can to "gcc --combine ...".

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/gadget/Makefile
drivers/usb/gadget/serial.c

index fcb5cb9094d905d7e26c35a7dae074fc28b633bd..853dd02294311427a2d093011daa7e1237db7df6 100644 (file)
@@ -26,7 +26,7 @@ C_UTILS =     composite.o usbstring.o config.o epautoconf.o
 
 g_zero-objs                    := zero.o f_sourcesink.o f_loopback.o $(C_UTILS)
 g_ether-objs                   := ether.o u_ether.o f_subset.o f_ecm.o $(C_UTILS)
-g_serial-objs                  := serial.o u_serial.o f_acm.o f_serial.o $(C_UTILS)
+g_serial-objs                  := serial.o
 g_midi-objs                    := gmidi.o usbstring.o config.o epautoconf.o
 gadgetfs-objs                  := inode.o
 g_file_storage-objs            := file_storage.o usbstring.o config.o \
index b3699afff002f4115b4c3ffaf1b975638aa88f1f..3faa7a7022df24926270d27399cfa92c69062b0e 100644 (file)
 
 /*-------------------------------------------------------------------------*/
 
+/*
+ * Kbuild is not very cooperative with respect to linking separately
+ * compiled library objects into one module.  So for now we won't use
+ * separate compilation ... ensuring init/exit sections work to shrink
+ * the runtime footprint, and giving us at least some parts of what
+ * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
+ */
+#include "composite.c"
+#include "usbstring.c"
+#include "config.c"
+#include "epautoconf.c"
+
+#include "f_acm.c"
+#include "f_serial.c"
+#include "u_serial.c"
+
+/*-------------------------------------------------------------------------*/
+
 /* Thanks to NetChip Technologies for donating this product ID.
 *
 * DO NOT REUSE THESE IDs with a protocol-incompatible driver!!  Ever!!