[PATCH] clean up CFLAGS - Charles Coffing

All of lore.kernel.org
 help / color / mirror / Atom feed

From: "Charles Coffing" <ccoffing@novell.com>
To: xen-devel@lists.xensource.com
Subject: [PATCH] clean up CFLAGS
Date: Thu, 09 Mar 2006 14:42:54 -0500	[thread overview]
Message-ID: <441022BC.D169.003C.0@novell.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 612 bytes --]

This patch cleans up the usage of CFLAGS.  This is nice for packagers,
who would like to control the base compilation flags from a central
place.

I've put some default CFLAGS (-Wall -O3) in Config.mk, and removed
redundant flags from the Makefiles.  I've also fixed a few places that
didn't properly inherit CFLAGS from Config.mk (but not vmxassist or
hvmloader; those ignore global defaults like before).  Also, individual
makefiles still add their own custom flags (-g, -Werror, -f*, etc) just
as before.

Please apply to xen-unstable.

Signed-off-by: Charles Coffing <ccoffing@novell.com>

Thanks,
Charles
 

[-- Attachment #2: xen-cflags.diff --]
[-- Type: application/octet-stream, Size: 13199 bytes --]

Index: xen-unstable/tools/misc/miniterm/Makefile
===================================================================
--- xen-unstable.orig/tools/misc/miniterm/Makefile
+++ xen-unstable/tools/misc/miniterm/Makefile
@@ -1,9 +1,10 @@
+XEN_ROOT:=../../..
+include $(XEN_ROOT)/tools/Rules.mk
+
 INSTALL		= install
 INSTALL_PROG	= $(INSTALL) -m0755
 INSTALL_DIR	= $(INSTALL) -d -m0755
 
-CC     = gcc
-CFLAGS = -Wall -O3
 TARGET = miniterm
 
 all: $(TARGET)
Index: xen-unstable/tools/ioemu/Makefile
===================================================================
--- xen-unstable.orig/tools/ioemu/Makefile
+++ xen-unstable/tools/ioemu/Makefile
@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 -include config-host.mak
 
-CFLAGS+=-Wall -O2 -g -fno-strict-aliasing 
+CFLAGS+= -g -fno-strict-aliasing
 ifdef CONFIG_DARWIN
 CFLAGS+= -mdynamic-no-pic
 endif
Index: xen-unstable/tools/ioemu/target-i386-dm/Makefile
===================================================================
--- xen-unstable.orig/tools/ioemu/target-i386-dm/Makefile
+++ xen-unstable/tools/ioemu/target-i386-dm/Makefile
@@ -13,7 +13,7 @@ ifdef CONFIG_USER_ONLY
 VPATH+=:$(SRC_PATH)/linux-user
 DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
 endif
-CFLAGS+=-Wall -O2 -g -fno-strict-aliasing
+CFLAGS+=-g -fno-strict-aliasing
 LDFLAGS=-g
 LIBS=
 HELPER_CFLAGS=$(CFLAGS)
Index: xen-unstable/Config.mk
===================================================================
--- xen-unstable.orig/Config.mk
+++ xen-unstable/Config.mk
@@ -20,6 +20,7 @@ STRIP      = $(CROSS_COMPILE)strip
 OBJCOPY    = $(CROSS_COMPILE)objcopy
 OBJDUMP    = $(CROSS_COMPILE)objdump
 
+CFLAGS      ?= -Wall -O3
 DISTDIR     ?= $(XEN_ROOT)/dist
 
 INSTALL      = install
Index: xen-unstable/tools/console/Makefile
===================================================================
--- xen-unstable.orig/tools/console/Makefile
+++ xen-unstable/tools/console/Makefile
@@ -9,8 +9,7 @@ INSTALL         = install
 INSTALL_PROG    = $(INSTALL) -m0755
 INSTALL_DIR     = $(INSTALL) -d -m0755
 
-CFLAGS  += -Wall -Werror -g3
-
+CFLAGS  += -Werror
 CFLAGS  += -I $(XEN_LIBXC)
 CFLAGS  += -I $(XEN_XENSTORE)
 
Index: xen-unstable/tools/misc/Makefile
===================================================================
--- xen-unstable.orig/tools/misc/Makefile
+++ xen-unstable/tools/misc/Makefile
@@ -5,7 +5,7 @@ INSTALL_DIR	= $(INSTALL) -d -m0755
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS   += -Wall -Werror -O3 
+CFLAGS   += -Werror
 
 INCLUDES += -I $(XEN_XC)
 INCLUDES += -I $(XEN_LIBXC)
Index: xen-unstable/tools/xenmon/Makefile
===================================================================
--- xen-unstable.orig/tools/xenmon/Makefile
+++ xen-unstable/tools/xenmon/Makefile
@@ -22,7 +22,7 @@ SBINDIR = $(PREFIX)/sbin
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS += -Wall -Werror -g
+CFLAGS  += -Werror -g
 CFLAGS  += -I $(XEN_XC)
 CFLAGS  += -I $(XEN_LIBXC)
 LDFLAGS += -L $(XEN_LIBXC)
Index: xen-unstable/tools/blktap/Makefile
===================================================================
--- xen-unstable.orig/tools/blktap/Makefile
+++ xen-unstable/tools/blktap/Makefile
@@ -22,10 +22,8 @@ LIBS     := -lpthread -lz
 SRCS     :=
 SRCS     += blktaplib.c xenbus.c blkif.c
 
-CFLAGS   += -Wall
 CFLAGS   += -Werror
 CFLAGS   += -Wno-unused
-#CFLAGS   += -O3
 CFLAGS   += -g3
 CFLAGS   += -fno-strict-aliasing
 CFLAGS   += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
Index: xen-unstable/tools/blktap/parallax/Makefile
===================================================================
--- xen-unstable.orig/tools/blktap/parallax/Makefile
+++ xen-unstable/tools/blktap/parallax/Makefile
@@ -31,10 +31,8 @@ VDI_TOOLS += vdi_fill
 VDI_TOOLS += vdi_tree
 VDI_TOOLS += vdi_validate
 
-CFLAGS   += -Wall
 CFLAGS   += -Werror
 CFLAGS   += -Wno-unused
-#CFLAGS   += -O3
 CFLAGS   += -g3
 CFLAGS   += -fno-strict-aliasing
 CFLAGS   += $(INCLUDES)
@@ -58,7 +56,7 @@ parallax: $(PLX_SRCS)
 	$(CC) $(CFLAGS) -o parallax -L.. $(LDFLAGS) $(PLX_SRCS)
 
 ${VDI_TOOLS}: %: %.c $(VDI_SRCS)
-	$(CC) $(CFLAGS) -g3 -o $@ $@.c $(LDFLAGS) $(VDI_SRCS)
+	$(CC) $(CFLAGS) -o $@ $@.c $(LDFLAGS) $(VDI_SRCS)
 
 .PHONY: TAGS clean install rpm
--include $(DEPS)
\ No newline at end of file
+-include $(DEPS)
Index: xen-unstable/tools/blktap/ublkback/Makefile
===================================================================
--- xen-unstable.orig/tools/blktap/ublkback/Makefile
+++ xen-unstable/tools/blktap/ublkback/Makefile
@@ -9,10 +9,8 @@ INSTALL_PROG = $(INSTALL) -m0755
 IBIN         = ublkback
 INSTALL_DIR  = /usr/sbin
 
-CFLAGS   += -Wall
 CFLAGS   += -Werror
 CFLAGS   += -Wno-unused
-#CFLAGS   += -O3
 CFLAGS   += -g3
 CFLAGS   += -fno-strict-aliasing
 CFLAGS   += -I $(XEN_LIBXC)
Index: xen-unstable/tools/debugger/pdb/Makefile
===================================================================
--- xen-unstable.orig/tools/debugger/pdb/Makefile
+++ xen-unstable/tools/debugger/pdb/Makefile
@@ -20,7 +20,6 @@ INCLUDES   += -I ./linux-2.6-module
 INCLUDES   += -I $(OCAML_ROOT)/lib/ocaml
 
 CFLAGS     += $(INCLUDES)
-CFLAGS     += -Wall
 CFLAGS     += -Werror
 CFLAGS     += -g
 
Index: xen-unstable/tools/vnet/libxutil/Makefile
===================================================================
--- xen-unstable.orig/tools/vnet/libxutil/Makefile
+++ xen-unstable/tools/vnet/libxutil/Makefile
@@ -29,8 +29,7 @@ LIB_SRCS += util.c
 LIB_OBJS := $(LIB_SRCS:.c=.o)
 PIC_OBJS := $(LIB_SRCS:.c=.opic)
 
-CFLAGS   += -Wall -Werror -O3 -fno-strict-aliasing
-CFLAGS   += -g
+CFLAGS   += -g -Werror -fno-strict-aliasing
 
 # Get gcc to generate the dependencies for us.
 CFLAGS   += -Wp,-MD,.$(@F).d
Index: xen-unstable/tools/vnet/vnetd/Makefile
===================================================================
--- xen-unstable.orig/tools/vnet/vnetd/Makefile
+++ xen-unstable/tools/vnet/vnetd/Makefile
@@ -43,8 +43,6 @@ CPPFLAGS += -D __ARCH_I386_ATOMIC__
 
 #----------------------------------------------------------------------------
 CFLAGS += -g
-CFLAGS += -O2
-CFLAGS += -Wall
 CFLAGS += $(INCLUDES) $(LIBS)
 
 LDFLAGS += $(LIBS)
Index: xen-unstable/tools/misc/cpuperf/Makefile
===================================================================
--- xen-unstable.orig/tools/misc/cpuperf/Makefile
+++ xen-unstable/tools/misc/cpuperf/Makefile
@@ -17,8 +17,6 @@ INSTALL_DIR	= $(INSTALL) -d -m0755
 XEN_ROOT=../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS      += -Wall -O3 
-
 HDRS         = $(wildcard *.h)
 SRCS         = $(wildcard *.c)
 OBJS         = $(patsubst %.c,%.o,$(SRCS))
Index: xen-unstable/xen/arch/x86/Rules.mk
===================================================================
--- xen-unstable.orig/xen/arch/x86/Rules.mk
+++ xen-unstable/xen/arch/x86/Rules.mk
@@ -15,7 +15,7 @@ CFLAGS  += -I$(BASEDIR)/include/asm-x86/
 CFLAGS  += -I$(BASEDIR)/include/asm-x86/mach-default
 
 ifneq ($(debug),y)
-CFLAGS  += -O3 -fomit-frame-pointer
+CFLAGS  += -fomit-frame-pointer
 endif
 
 # Prevent floating-point variables from creeping into Xen.
Index: xen-unstable/tools/misc/mbootpack/Makefile
===================================================================
--- xen-unstable.orig/tools/misc/mbootpack/Makefile
+++ xen-unstable/tools/misc/mbootpack/Makefile
@@ -20,10 +20,8 @@ GDB	:= gdb
 INCS	:= -I. -I-
 DEFS	:= 
 LDFLAGS	:= 
-CFLAGS	:= -Wall -Wpointer-arith -Wcast-qual -Wno-unused -Wno-format
-CFLAGS	+= -Wmissing-prototypes
-#CFLAGS	+= -pipe -g -O0 -Wcast-align
-CFLAGS	+= -pipe -O3 
+CFLAGS	+= -Wpointer-arith -Wcast-qual -Wno-unused -Wno-format
+CFLAGS	+= -Wmissing-prototypes -pipe
 
 #  What object files need building for the program
 OBJS	:= mbootpack.o buildimage.o
Index: xen-unstable/tools/debugger/libxendebug/Makefile
===================================================================
--- xen-unstable.orig/tools/debugger/libxendebug/Makefile
+++ xen-unstable/tools/debugger/libxendebug/Makefile
@@ -14,7 +14,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 SRCS     := xendebug.c
 
-CFLAGS   += -Wall -Werror -O3 -fno-strict-aliasing
+CFLAGS   += -Werror -fno-strict-aliasing
 CFLAGS   += $(INCLUDES) -I. -I$(XEN_ROOT)/tools/libxc
 # Get gcc to generate the dependencies for us.
 CFLAGS   += -Wp,-MD,.$(@F).d
Index: xen-unstable/tools/libxc/Makefile
===================================================================
--- xen-unstable.orig/tools/libxc/Makefile
+++ xen-unstable/tools/libxc/Makefile
@@ -48,9 +48,7 @@ BUILD_SRCS += xc_linux_save.c
 BUILD_SRCS += xc_hvm_build.c
 endif
 
-CFLAGS   += -Wall
 CFLAGS   += -Werror
-CFLAGS   += -O3
 CFLAGS   += -fno-strict-aliasing
 CFLAGS   += $(INCLUDES) -I.
 
Index: xen-unstable/tools/security/Makefile
===================================================================
--- xen-unstable.orig/tools/security/Makefile
+++ xen-unstable/tools/security/Makefile
@@ -1,9 +1,7 @@
 XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS   += -Wall
 CFLAGS   += -Werror
-CFLAGS   += -O3
 CFLAGS   += -fno-strict-aliasing
 CFLAGS   += -I.
 
Index: xen-unstable/tools/vtpm/Rules.mk
===================================================================
--- xen-unstable.orig/tools/vtpm/Rules.mk
+++ xen-unstable/tools/vtpm/Rules.mk
@@ -14,7 +14,7 @@ INSTALL_DIR     = $(INSTALL) -d -m0755
 TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
 
 # General compiler flags
-CFLAGS   = -Wall -Werror -g3 -I.
+CFLAGS  += -Werror -I.
 
 # For generating dependencies
 CFLAGS	+= -Wp,-MD,.$(@F).d
Index: xen-unstable/tools/xcutils/Makefile
===================================================================
--- xen-unstable.orig/tools/xcutils/Makefile
+++ xen-unstable/tools/xcutils/Makefile
@@ -19,7 +19,7 @@ PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/xe
 
 INCLUDES += -I $(XEN_LIBXC)
 
-CFLAGS += -Wall -Werror -O3 -fno-strict-aliasing
+CFLAGS += -Werror -fno-strict-aliasing
 CFLAGS += $(INCLUDES)
 
 # Make gcc generate dependencies.
Index: xen-unstable/tools/xentrace/Makefile
===================================================================
--- xen-unstable.orig/tools/xentrace/Makefile
+++ xen-unstable/tools/xentrace/Makefile
@@ -6,7 +6,7 @@ INSTALL_DATA	= $(INSTALL) -m0644
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS  += -Wall -Werror -O3
+CFLAGS  += -Werror
 
 CFLAGS  += -I $(XEN_XC)
 CFLAGS  += -I $(XEN_LIBXC)
Index: xen-unstable/tools/misc/lomount/Makefile
===================================================================
--- xen-unstable.orig/tools/misc/lomount/Makefile
+++ xen-unstable/tools/misc/lomount/Makefile
@@ -6,7 +6,7 @@ INSTALL_DATA	= $(INSTALL) -m0644
 XEN_ROOT=../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS  += -Wall -Werror -O3
+CFLAGS  += -Werror
 
 HDRS     = $(wildcard *.h)
 OBJS     = $(patsubst %.c,%.o,$(wildcard *.c))
Index: xen-unstable/tools/misc/nsplitd/Makefile
===================================================================
--- xen-unstable.orig/tools/misc/nsplitd/Makefile
+++ xen-unstable/tools/misc/nsplitd/Makefile
@@ -1,6 +1,6 @@
+XEN_ROOT:=../..
+include $(XEN_ROOT)/tools/Rules.mk
 
-CC     = gcc
-CFLAGS = -Wall -O3
 CFILES = $(wildcard *.c)
 
 HDRS     = $(wildcard *.h)
Index: xen-unstable/tools/vtpm_manager/Rules.mk
===================================================================
--- xen-unstable.orig/tools/vtpm_manager/Rules.mk
+++ xen-unstable/tools/vtpm_manager/Rules.mk
@@ -14,7 +14,7 @@ INSTALL_DIR     = $(INSTALL) -d -m0755
 TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
 
 # General compiler flags
-CFLAGS	= -Wall -Werror -g3 -I.
+CFLAGS	+= -Werror -I.
 
 # For generating dependencies
 CFLAGS	+= -Wp,-MD,.$(@F).d
Index: xen-unstable/tools/firmware/hvmloader/Makefile
===================================================================
--- xen-unstable.orig/tools/firmware/hvmloader/Makefile
+++ xen-unstable/tools/firmware/hvmloader/Makefile
@@ -19,7 +19,8 @@
 #
 
 # External CFLAGS can do more harm than good.
-CFLAGS :=
+# Start with a benign set, so I don't get some other defaults.
+CFLAGS := -Wall -O2
 
 XEN_ROOT = ../../..
 include $(XEN_ROOT)/Config.mk
@@ -38,7 +39,7 @@ CFLAGS  += $(call test-gcc-flag,$(CC),-f
 CFLAGS  += $(call test-gcc-flag,$(CC),-fno-stack-protector-all)
 
 OBJCOPY  = objcopy
-CFLAGS  += $(DEFINES) -I. $(XENINC) -Wall -fno-builtin -O2 -msoft-float
+CFLAGS  += $(DEFINES) -I. $(XENINC) -fno-builtin -msoft-float
 CFLAGS  += -m32 -march=i686
 LDFLAGS  = -m32 -nostdlib -Wl,-N -Wl,-Ttext -Wl,$(LOADADDR)
 
Index: xen-unstable/tools/firmware/vmxassist/Makefile
===================================================================
--- xen-unstable.orig/tools/firmware/vmxassist/Makefile
+++ xen-unstable/tools/firmware/vmxassist/Makefile
@@ -19,7 +19,8 @@
 #
 
 # External CFLAGS can do more harm than good.
-CFLAGS :=
+# Start with a benign set, so I don't get some other defaults.
+CFLAGS := -Wall -O2
 
 XEN_ROOT = ../../..
 include $(XEN_ROOT)/Config.mk
@@ -37,7 +38,7 @@ CFLAGS  += $(call test-gcc-flag,$(CC),-f
 
 CPP      = cpp -P
 OBJCOPY  = objcopy -p -O binary -R .note -R .comment -R .bss -S --gap-fill=0
-CFLAGS  += $(DEFINES) -I. $(XENINC) -Wall -fno-builtin -O2 -msoft-float
+CFLAGS  += $(DEFINES) -I. $(XENINC) -fno-builtin -msoft-float
 CFLAGS  += -m32 -march=i686
 LDFLAGS  = -m elf_i386
 

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

next             reply	other threads:[~2006-03-09 19:42 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-03-09 19:42 Charles Coffing [this message]
2006-03-09 19:47 ` [PATCH] clean up CFLAGS Keir Fraser
2006-03-09 20:16   ` Charles Coffing
2006-03-09 21:31     ` Keir Fraser
2006-03-09 20:18   ` Keir Fraser
2006-03-10 14:50 ` Andi Kleen
2006-03-10 14:58   ` Keir Fraser
2006-03-10  8:30     ` Andi Kleen
2006-03-10 16:30       ` Keir Fraser
2006-03-10 15:35   ` Charles Coffing

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=441022BC.D169.003C.0@novell.com \
    --to=ccoffing@novell.com \
    --cc=xen-devel@lists.xensource.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.