More build config changes:

 - Build -O2 rather than -O3
 - Build with -Wstrict-prototypes
 - Move target-specific generic compiler switches to Config.mk

Signed-off-by: Keir Fraser <keir@xensource.com>

15 files changed, 20 insertions, 30 deletions

diff --git a/tools/Rules.mk b/tools/Rules.mk
index c52de46915..a2eeced638 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -10,16 +10,6 @@ XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
 XEN_XENSTORE       = $(XEN_ROOT)/tools/xenstore
 XEN_LIBXENSTAT     = $(XEN_ROOT)/tools/xenstat/libxenstat/src
 
-ifeq ($(XEN_TARGET_ARCH),x86_32)
-CFLAGS  += -m32 -march=i686
-LDFLAGS += -m32
-endif
-
-ifeq ($(XEN_TARGET_ARCH),x86_64)
-CFLAGS  += -m64
-LDFLAGS += -m64
-endif
-
 X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
 
 %.opic: %.c
diff --git a/tools/ioemu/target-i386-dm/Makefile b/tools/ioemu/target-i386-dm/Makefile
index 3400621cef..887f73bea8 100644
--- a/tools/ioemu/target-i386-dm/Makefile
+++ b/tools/ioemu/target-i386-dm/Makefile
@@ -235,7 +235,7 @@ endif
 all: $(PROGS)
 
 $(QEMU_USER): $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $^  $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^  $(LIBS)
 ifeq ($(ARCH),alpha)
 # Mark as 32 bit binary, i. e. it will be mapped into the low 31 bit of
 # the address space (31 bit so sign extending doesn't matter)
@@ -311,7 +311,7 @@ endif
 endif
 
 $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a
-	$(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(VNC_LIBS) $(VL_LIBS) -lpthread
+	$(CC) $(CFLAGS) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(VNC_LIBS) $(VL_LIBS) -lpthread
 
 vnc.o: vnc.c keyboard_rdesktop.c
 	$(CC) $(CFLAGS) $(DEFINES) $(VNC_CFLAGS) -c -o $@ $<
diff --git a/tools/ioemu/vl.h b/tools/ioemu/vl.h
index 2b30dc8f26..439c530d48 100644
--- a/tools/ioemu/vl.h
+++ b/tools/ioemu/vl.h
@@ -697,7 +697,7 @@ void lance_init(NetDriverState *nd, int irq, uint32_t leaddr, uint32_t ledaddr);
 void tcx_init(DisplayState *ds, uint32_t addr);
 
 /* sched.c */
-void sched_init();
+void sched_init(uint32_t, uint32_t);
 
 /* magic-load.c */
 void magic_init(const char *kfn, int kloadaddr, uint32_t addr);
@@ -799,7 +799,7 @@ void readline_start(const char *prompt, int is_password,
 
 int gdbserver_start(int port);
 void update_select_wakeup_events(void);
-void tun_receive_handler();
+void tun_receive_handler(fd_set *);
 
 extern char domain_name[];
 #endif /* VL_H */
diff --git a/tools/misc/lomount/lomount.c b/tools/misc/lomount/lomount.c
index b72f77da03..85e5f3b584 100644
--- a/tools/misc/lomount/lomount.c
+++ b/tools/misc/lomount/lomount.c
@@ -195,7 +195,7 @@ done:
 	return fail;
 }
 
-void usage()
+void usage(void)
 {
 	fprintf(stderr, "You must specify at least -diskimage and -partition.\n");
 	fprintf(stderr, "All other arguments are passed through to 'mount'.\n");
diff --git a/tools/misc/mbootpack/Makefile b/tools/misc/mbootpack/Makefile
index 3c6791e4ee..d1e3334bf7 100644
--- a/tools/misc/mbootpack/Makefile
+++ b/tools/misc/mbootpack/Makefile
@@ -31,7 +31,7 @@ DEPFLAGS = -Wp,-MD,.$(@F).d
 DEPS     = .*.d
 
 mbootpack: $(OBJS)
-	$(HOSTCC) -o $@ $(filter-out %.a, $^) $(LDFLAGS)
+	$(HOSTCC) -o $@ $(filter-out %.a, $^)
 
 clean:
 	$(RM) mbootpack *.o $(DEPS) bootsect setup bzimage_header.c bin2c
diff --git a/tools/misc/xc_shadow.c b/tools/misc/xc_shadow.c
index 20363637bf..83c52ebc19 100644
--- a/tools/misc/xc_shadow.c
+++ b/tools/misc/xc_shadow.c
@@ -18,7 +18,7 @@
 #include <errno.h>
 #include <string.h>
 
-void usage()
+void usage(void)
 {
     printf("xc_shadow: -[0|1|2]\n");
     printf("    set shadow mode\n");
@@ -28,7 +28,7 @@ void usage()
 int main(int argc, char *argv[])
 {
     int xc_handle;
-    int mode;
+    int mode = 0;
 
     if ( argc > 1 )
     {
diff --git a/tools/vtpm_manager/manager/Makefile b/tools/vtpm_manager/manager/Makefile
index e6f20f5a5e..278a37e963 100644
--- a/tools/vtpm_manager/manager/Makefile
+++ b/tools/vtpm_manager/manager/Makefile
@@ -20,7 +20,7 @@ mrproper: clean
 	rm -f $(BIN) *~
 
 $(BIN): $(OBJS)
-	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
 
 # libraries
 LIBS += ../tcs/libTCS.a ../util/libTCGUtils.a ../crypto/libtcpaCrypto.a
diff --git a/tools/xenmon/xenbaked.c b/tools/xenmon/xenbaked.c
index 1289e47425..a7cd4be2d0 100644
--- a/tools/xenmon/xenbaked.c
+++ b/tools/xenmon/xenbaked.c
@@ -379,7 +379,7 @@ struct t_rec **init_rec_ptrs(struct t_buf **meta, unsigned int num)
 /**
  * get_num_cpus - get the number of logical CPUs
  */
-unsigned int get_num_cpus()
+unsigned int get_num_cpus(void)
 {
     dom0_op_t op;
     int xc_handle = xc_interface_open();
@@ -409,7 +409,7 @@ unsigned int get_num_cpus()
 /**
  * monitor_tbufs - monitor the contents of tbufs
  */
-int monitor_tbufs()
+int monitor_tbufs(void)
 {
     int i;
     extern void process_record(int, struct t_rec *);
diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
index d874ba3af1..52832017ff 100644
--- a/tools/xenstat/libxenstat/Makefile
+++ b/tools/xenstat/libxenstat/Makefile
@@ -48,7 +48,7 @@ $(LIB): $(OBJECTS)
 	$(RANLIB) $@
 
 $(SHLIB): $(OBJECTS)
-	$(CC) $(LDFLAGS) $(SONAME_FLAGS) -shared -o $@ $(OBJECTS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(SONAME_FLAGS) -shared -o $@ $(OBJECTS)
 
 src/xenstat.o: src/xenstat.c src/xenstat.h src/xen-interface.h
 	$(CC) $(CFLAGS) $(WARN_FLAGS) -c -o $@ $<
diff --git a/tools/xenstat/libxenstat/src/xen-interface.c b/tools/xenstat/libxenstat/src/xen-interface.c
index 6b6fa6b9fb..59723157ad 100644
--- a/tools/xenstat/libxenstat/src/xen-interface.c
+++ b/tools/xenstat/libxenstat/src/xen-interface.c
@@ -31,7 +31,7 @@ struct xi_handle {
 
 /* Initialize for xen-interface.  Returns a handle to be used with subsequent
  * calls to the xen-interface functions or NULL if an error occurs. */
-xi_handle *xi_init()
+xi_handle *xi_init(void)
 {
 	xi_handle *handle;
 
diff --git a/tools/xenstat/libxenstat/src/xen-interface.h b/tools/xenstat/libxenstat/src/xen-interface.h
index c1e74edcd6..fc7119ae34 100644
--- a/tools/xenstat/libxenstat/src/xen-interface.h
+++ b/tools/xenstat/libxenstat/src/xen-interface.h
@@ -26,7 +26,7 @@ typedef struct xi_handle xi_handle;
 
 /* Initialize for xen-interface.  Returns a handle to be used with subsequent
  * calls to the xen-interface functions or NULL if an error occurs. */
-xi_handle *xi_init();
+xi_handle *xi_init(void);
 
 /* Release the handle to libxc, free resources, etc. */
 void xi_uninit(xi_handle *handle);
diff --git a/tools/xenstat/libxenstat/src/xenstat.c b/tools/xenstat/libxenstat/src/xenstat.c
index e8a6928dac..3332f2cad7 100644
--- a/tools/xenstat/libxenstat/src/xenstat.c
+++ b/tools/xenstat/libxenstat/src/xenstat.c
@@ -129,7 +129,7 @@ static xenstat_collector collectors[] = {
 /*
  * libxenstat API
  */
-xenstat_handle *xenstat_init()
+xenstat_handle *xenstat_init(void)
 {
 	xenstat_handle *handle;
 
diff --git a/tools/xenstat/libxenstat/src/xenstat.h b/tools/xenstat/libxenstat/src/xenstat.h
index b9ac1d3782..90676e8763 100644
--- a/tools/xenstat/libxenstat/src/xenstat.h
+++ b/tools/xenstat/libxenstat/src/xenstat.h
@@ -26,7 +26,7 @@ typedef struct xenstat_network xenstat_network;
 
 /* Initialize the xenstat library.  Returns a handle to be used with
  * subsequent calls to the xenstat library, or NULL if an error occurs. */
-xenstat_handle *xenstat_init();
+xenstat_handle *xenstat_init(void);
 
 /* Release the handle to libxc, free resources, etc. */
 void xenstat_uninit(xenstat_handle * handle);
diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
index b23aa40fa5..bfa71f56bd 100644
--- a/tools/xenstore/xenstored_core.c
+++ b/tools/xenstore/xenstored_core.c
@@ -66,7 +66,7 @@ static char *tracefile = NULL;
 static TDB_CONTEXT *tdb_ctx;
 
 static void corrupt(struct connection *conn, const char *fmt, ...);
-static void check_store();
+static void check_store(void);
 
 #define log(...)							\
 	do {								\
@@ -238,7 +238,7 @@ static void trigger_reopen_log(int signal __attribute__((unused)))
 }
 
 
-static void reopen_log()
+static void reopen_log(void)
 {
 	if (tracefile) {
 		if (tracefd > 0)
@@ -1612,7 +1612,7 @@ static void clean_store(struct hashtable *reachable)
 }
 
 
-static void check_store()
+static void check_store(void)
 {
 	char * root = talloc_strdup(NULL, "/");
 	struct hashtable * reachable =
diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c
index 2780e1dbb2..34b2a6a649 100644
--- a/tools/xentrace/xentrace.c
+++ b/tools/xentrace/xentrace.c
@@ -258,7 +258,7 @@ struct t_rec **init_rec_ptrs(struct t_buf **meta, unsigned int num)
 /**
  * get_num_cpus - get the number of logical CPUs
  */
-unsigned int get_num_cpus()
+unsigned int get_num_cpus(void)
 {
     dom0_op_t op;
     int xc_handle = xc_interface_open();