diff -ur xen-3.4.2.orig//config/StdGNU.mk xen-3.4.2//config/StdGNU.mk
--- xen-3.4.2.orig//config/StdGNU.mk	2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//config/StdGNU.mk	2011-09-26 22:57:18.900759748 +0800
@@ -48,8 +48,8 @@
 SHLIB_CFLAGS = -shared
 
 ifneq ($(debug),y)
-CFLAGS += -O2 -fomit-frame-pointer
+CFLAGS += -fomit-frame-pointer
 else
 # Less than -O1 produces bad code and large stack frames
-CFLAGS += -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls
+CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
 endif
diff -ur xen-3.4.2.orig//config/SunOS.mk xen-3.4.2//config/SunOS.mk
--- xen-3.4.2.orig//config/SunOS.mk	2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//config/SunOS.mk	2011-09-26 22:57:18.922759748 +0800
@@ -45,10 +45,10 @@
 SHLIB_CFLAGS = -R $(SunOS_LIBDIR) -shared
 
 ifneq ($(debug),y)
-CFLAGS += -O2 -fno-omit-frame-pointer
+CFLAGS += -fno-omit-frame-pointer
 else
 # Less than -O1 produces bad code and large stack frames
-CFLAGS += -O1 -fno-omit-frame-pointer
+CFLAGS += -fno-omit-frame-pointer
 endif
 
 CFLAGS += -Wa,--divide -D_POSIX_C_SOURCE=200112L -D__EXTENSIONS__
diff -ur xen-3.4.2.orig//Config.mk xen-3.4.2//Config.mk
--- xen-3.4.2.orig//Config.mk	2011-09-26 22:51:41.064759896 +0800
+++ xen-3.4.2//Config.mk	2011-09-26 23:05:17.673759540 +0800
@@ -14,7 +14,7 @@
 
 # Tools to run on system hosting the build
 HOSTCC      = gcc
-HOSTCFLAGS  = -Wall  -Wstrict-prototypes -O2 -fomit-frame-pointer
+HOSTCFLAGS  = -Wall  -Wstrict-prototypes -fomit-frame-pointer
 HOSTCFLAGS += -fno-strict-aliasing
 
 DISTDIR     ?= $(XEN_ROOT)/dist
@@ -88,7 +88,7 @@
 endef
 
 ifeq ($(debug),y)
-CFLAGS += -g
+#CFLAGS += -g
 endif
 
 CFLAGS += -fno-strict-aliasing
diff -ur xen-3.4.2.orig//extras/mini-os/arch/ia64/arch.mk xen-3.4.2//extras/mini-os/arch/ia64/arch.mk
--- xen-3.4.2.orig//extras/mini-os/arch/ia64/arch.mk	2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//extras/mini-os/arch/ia64/arch.mk	2011-09-26 22:57:18.971759748 +0800
@@ -1,8 +1,8 @@
 
 ARCH_CFLAGS := -mfixed-range=f2-f5,f12-f15,f32-f127 -mconstant-gp
-ARCH_CFLAGS += -O2
+#ARCH_CFLAGS += -O2
 ARCH_ASFLAGS := -x assembler-with-cpp
-ARCH_ASFLAGS += -mfixed-range=f2-f5,f12-f15,f32-f127 -fomit-frame-pointer
+ARCH_ASFLAGS += -mfixed-range=f2-f5,f12-f15,f32-f127
 ARCH_ASFLAGS += -fno-builtin -fno-common -fno-strict-aliasing -mconstant-gp
 
 ARCH_LDFLAGS = -warn-common
diff -ur xen-3.4.2.orig//extras/mini-os/minios.mk xen-3.4.2//extras/mini-os/minios.mk
--- xen-3.4.2.orig//extras/mini-os/minios.mk	2011-09-26 22:51:41.064759896 +0800
+++ xen-3.4.2//extras/mini-os/minios.mk	2011-09-26 23:03:05.112759579 +0800
@@ -16,14 +16,14 @@
 DEF_LDFLAGS +=
 
 ifeq ($(debug),y)
-DEF_CFLAGS += -g
+#DEF_CFLAGS += -g
 #DEF_CFLAGS += -DMM_DEBUG
 #DEF_CFLAGS += -DFS_DEBUG
 #DEF_CFLAGS += -DLIBC_DEBUG
 DEF_CFLAGS += -DGNT_DEBUG
 DEF_CFLAGS += -DGNTMAP_DEBUG
 else
-DEF_CFLAGS += -O3
+#DEF_CFLAGS += -O3
 endif
 
 # Make the headers define our internal stuff
diff -ur xen-3.4.2.orig//stubdom/grub.patches/00cvs xen-3.4.2//stubdom/grub.patches/00cvs
--- xen-3.4.2.orig//stubdom/grub.patches/00cvs	2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//stubdom/grub.patches/00cvs	2011-09-26 23:07:27.821759483 +0800
@@ -223,12 +223,12 @@
 +++ grub/configure.ac	2008-04-10 23:26:50.000000000 +0100
 @@ -86,13 +86,13 @@ if test "x$ac_cv_prog_gcc" = xyes; then
      fi
-     STAGE1_CFLAGS="-O2"
-     GRUB_CFLAGS="-O2"
+     STAGE1_CFLAGS=""
+     GRUB_CFLAGSS=""
 -    AC_CACHE_CHECK([whether optimization for size works], size_flag, [
 +    AC_CACHE_CHECK([whether optimization for size works], grub_cv_cc_Os, [
        saved_CFLAGS=$CFLAGS
-       CFLAGS="-Os -g"
+#       CFLAGS="-Os -g"
 -      AC_TRY_COMPILE(, , size_flag=yes, size_flag=no)
 +      AC_TRY_COMPILE(, , grub_cv_cc_Os=yes, grub_cv_cc_Os=no)
        CFLAGS=$saved_CFLAGS
@@ -237,7 +237,7 @@
 +    if test "x$grub_cv_cc_Os" = xyes; then
        STAGE2_CFLAGS="-Os"
      else
-       STAGE2_CFLAGS="-O2 -fno-strength-reduce -fno-unroll-loops"
+       STAGE2_CFLAGS=" -fno-strength-reduce -fno-unroll-loops"
 @@ -100,16 +100,16 @@ if test "x$ac_cv_prog_gcc" = xyes; then
      # OpenBSD has a GCC extension for protecting applications from
      # stack smashing attacks, but GRUB doesn't want this feature.
diff -ur xen-3.4.2.orig//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure
--- xen-3.4.2.orig//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure	2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure	2011-09-26 23:10:15.762759409 +0800
@@ -16,7 +16,7 @@
   NULLCMD=:
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
+  alias '${1+"$@"}'='"$@"'
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
@@ -422,7 +422,7 @@
   | --exec=* | --exe=* | --ex=*)
     exec_prefix=$ac_optarg ;;
 
-  -gas | --gas | --ga | --g)
+ as | --gas | --ga | --g)
     # Obsolete; use --with-gas.
     with_gas=yes ;;
 
@@ -1010,7 +1010,7 @@
       else
         case $ac_arg in
           *=* | --config-cache | -C | -disable-* | --disable-* \
-          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+          | -enable-* | --enable-* |as | --g* | -nfp | --nf* \
           | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
           | -with-* | --with-* | -without-* | --without-* | --x)
             case "$ac_configure_args0 " in
@@ -1849,9 +1849,9 @@
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+CFLAGS=""
+echo "$as_me:$LINENO: checking whether $CC accepts" >&5
+echo $ECHO_N "checking whether $CC accepts... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1898,13 +1898,13 @@
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+    CFLAGS=""
   else
-    CFLAGS="-g"
+    CFLAGS=""
   fi
 else
   if test "$GCC" = yes; then
-    CFLAGS="-O2"
+#    CFLAGS="-O2"
   else
     CFLAGS=
   fi
@@ -2244,7 +2244,7 @@
 # IRIX /sbin/install
 # AIX /bin/install
 # AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AIX 4 /usr/bin/installbsd, which doesn't work without a flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
@@ -3604,7 +3604,7 @@
   NULLCMD=:
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
+  alias '${1+"$@"}'='"$@"'
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
@@ -4141,7 +4141,7 @@
   ac_more_lines=:
   ac_sed_cmds=
   while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
+    if test $ac_begt 1; then
       sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
     else
       sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
diff -ur xen-3.4.2.orig//tools/debugger/xenitp/Makefile xen-3.4.2//tools/debugger/xenitp/Makefile
--- xen-3.4.2.orig//tools/debugger/xenitp/Makefile	2011-09-26 22:51:41.065759896 +0800
+++ xen-3.4.2//tools/debugger/xenitp/Makefile	2011-09-26 22:57:19.116759748 +0800
@@ -1,7 +1,7 @@
 XEN_ROOT=../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-#CFLAGS  +=  -g -O0
+#CFLAGS  +=  -O0
 
 CFLAGS  += $(CFLAGS_libxenctrl)
 
diff -ur xen-3.4.2.orig//tools/firmware/rombios/Makefile xen-3.4.2//tools/firmware/rombios/Makefile
--- xen-3.4.2.orig//tools/firmware/rombios/Makefile	2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//tools/firmware/rombios/Makefile	2011-09-26 22:57:19.094759748 +0800
@@ -19,7 +19,7 @@
 	gcc -DBX_SMP_PROCESSORS=1 -E -P $< > _rombios_.c
 	bcc -o rombios.s -C-c -D__i86__ -0 -S _rombios_.c
 	sed -e 's/^\.text//' -e 's/^\.data//' rombios.s > _rombios_.s
-	as86 _rombios_.s -b tmp.bin -u- -w- -g -0 -j -O -l rombios.txt
+	as86 _rombios_.s -b tmp.bin -u- -w- -0 -j -O -l rombios.txt
 	-perl makesym.perl < rombios.txt > rombios.sym
 	mv tmp.bin BIOS-bochs-latest
 	./biossums BIOS-bochs-latest
diff -ur xen-3.4.2.orig//tools/firmware/vgabios/Makefile xen-3.4.2//tools/firmware/vgabios/Makefile
--- xen-3.4.2.orig//tools/firmware/vgabios/Makefile	2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//tools/firmware/vgabios/Makefile	2011-09-26 22:57:19.095759748 +0800
@@ -40,7 +40,7 @@
 	$(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE $(VGABIOS_DATE) > _vgabios_.c
 	$(BCC) -o vgabios.s -C-c -D__i86__ -S -0 _vgabios_.c
 	sed -e 's/^\.text//' -e 's/^\.data//' vgabios.s > _vgabios_.s
-	$(AS86) _vgabios_.s -b vgabios.bin -u -w- -g -0 -j -O -l vgabios.txt
+	$(AS86) _vgabios_.s -b vgabios.bin -u -w- -0 -j -O -l vgabios.txt
 	rm -f _vgabios_.s _vgabios_.c vgabios.s
 	cp vgabios.bin VGABIOS-lgpl-latest.bin
 	./biossums VGABIOS-lgpl-latest.bin
@@ -50,7 +50,7 @@
 	$(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE -DDEBUG $(VGABIOS_DATE) > _vgabios-debug_.c
 	$(BCC) -o vgabios-debug.s -C-c -D__i86__ -S -0 _vgabios-debug_.c
 	sed -e 's/^\.text//' -e 's/^\.data//' vgabios-debug.s > _vgabios-debug_.s
-	$(AS86) _vgabios-debug_.s -b vgabios.debug.bin -u -w- -g -0 -j -O -l vgabios.debug.txt
+	$(AS86) _vgabios-debug_.s -b vgabios.debug.bin -u -w- -0 -j -O -l vgabios.debug.txt
 	rm -f _vgabios-debug_.s _vgabios-debug_.c vgabios-debug.s
 	cp vgabios.debug.bin VGABIOS-lgpl-latest.debug.bin
 	./biossums VGABIOS-lgpl-latest.debug.bin
@@ -60,7 +60,7 @@
 	$(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus_.c
 	$(BCC) -o vgabios-cirrus.s -C-c -D__i86__ -S -0 _vgabios-cirrus_.c
 	sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus.s > _vgabios-cirrus_.s
-	$(AS86) _vgabios-cirrus_.s -b vgabios-cirrus.bin -u -w- -g -0 -j -O -l vgabios-cirrus.txt
+	$(AS86) _vgabios-cirrus_.s -b vgabios-cirrus.bin -u -w- -0 -j -O -l vgabios-cirrus.txt
 	rm -f _vgabios-cirrus_.s _vgabios-cirrus_.c vgabios-cirrus.s
 	cp vgabios-cirrus.bin VGABIOS-lgpl-latest.cirrus.bin
 	./biossums VGABIOS-lgpl-latest.cirrus.bin
@@ -70,7 +70,7 @@
 	$(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DCIRRUS_DEBUG -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus-debug_.c
 	$(BCC) -o vgabios-cirrus-debug.s -C-c -D__i86__ -S -0 _vgabios-cirrus-debug_.c
 	sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus-debug.s > _vgabios-cirrus-debug_.s
-	$(AS86) _vgabios-cirrus-debug_.s -b vgabios-cirrus.debug.bin -u -w- -g -0 -j -O -l vgabios-cirrus.debug.txt
+	$(AS86) _vgabios-cirrus-debug_.s -b vgabios-cirrus.debug.bin -u -w- -0 -j -O -l vgabios-cirrus.debug.txt
 	rm -f _vgabios-cirrus-debug_.s _vgabios-cirrus-debug_.c vgabios-cirrus-debug.s
 	cp vgabios-cirrus.debug.bin VGABIOS-lgpl-latest.cirrus.debug.bin
 	./biossums VGABIOS-lgpl-latest.cirrus.debug.bin
diff -ur xen-3.4.2.orig//tools/flask/loadpolicy/Makefile xen-3.4.2//tools/flask/loadpolicy/Makefile
--- xen-3.4.2.orig//tools/flask/loadpolicy/Makefile	2011-09-26 22:51:41.065759896 +0800
+++ xen-3.4.2//tools/flask/loadpolicy/Makefile	2011-09-26 22:57:19.031759748 +0800
@@ -6,7 +6,7 @@
 LIBFLASK_ROOT = $(XEN_ROOT)/tools/flask/libflask
 
 PROFILE=#-pg
-BASECFLAGS=-Wall -g 
+BASECFLAGS=-Wall 
 BASECFLAGS+= $(PROFILE)
 #BASECFLAGS+= -I$(XEN_ROOT)/tools
 BASECFLAGS+= $(CFLAGS_libxenctrl)
diff -ur xen-3.4.2.orig//tools/hotplug/Linux/Makefile xen-3.4.2//tools/hotplug/Linux/Makefile
--- xen-3.4.2.orig//tools/hotplug/Linux/Makefile	2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/hotplug/Linux/Makefile	2011-09-26 22:57:19.050759748 +0800
@@ -45,7 +45,7 @@
 ifeq ($(findstring $(DI),$(DE)),$(DI))
 HOTPLUGS=install-hotplug install-udev
 else
-ifeq ($(shell [ $(UDEVVER) -ge 059 ] && echo 1),1)
+ifeq ($(shell [ $(UDEVVER)e 059 ] && echo 1),1)
 HOTPLUGS=install-udev
 else
 HOTPLUGS=install-hotplug
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/bsd-user/main.c xen-3.4.2//tools/ioemu-qemu-xen/bsd-user/main.c
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/bsd-user/main.c	2009-11-05 19:44:56.000000000 +0800
+++ xen-3.4.2//tools/ioemu-qemu-xen/bsd-user/main.c	2011-09-26 22:57:19.289759748 +0800
@@ -331,7 +331,7 @@
            "\n"
            "Standard options:\n"
            "-h                print this help\n"
-           "-g port           wait gdb connection to port\n"
+           "port           wait gdb connection to port\n"
            "-L path           set the elf interpreter prefix (default=%s)\n"
            "-s size           set the stack size in bytes (default=%ld)\n"
            "-cpu model        select CPU (-cpu ? for list)\n"
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/configure xen-3.4.2//tools/ioemu-qemu-xen/configure
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/configure	2011-09-26 22:51:41.066759896 +0800
+++ xen-3.4.2//tools/ioemu-qemu-xen/configure	2011-09-26 22:57:19.222759748 +0800
@@ -285,7 +285,7 @@
                 exit 1
             fi
         fi
-        if test "$solarisrev" -ge 9 ; then
+        if test "$solarisrev"e 9 ; then
             kqemu="yes"
         fi
     fi
@@ -464,9 +464,9 @@
 
 
 # default flags for all hosts
-CFLAGS="$CFLAGS -O2 -g -fno-strict-aliasing"
+CFLAGS="$CFLAGS -fno-strict-aliasing"
 CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls"
-LDFLAGS="$LDFLAGS -g"
+LDFLAGS="$LDFLAGS"
 if test "$werror" = "yes" ; then
 CFLAGS="$CFLAGS"
 fi
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/darwin-user/main.c xen-3.4.2//tools/ioemu-qemu-xen/darwin-user/main.c
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/darwin-user/main.c	2009-11-05 19:44:56.000000000 +0800
+++ xen-3.4.2//tools/ioemu-qemu-xen/darwin-user/main.c	2011-09-26 22:57:19.295759748 +0800
@@ -749,7 +749,7 @@
            "\n"
            "debug options:\n"
            "-d options   activate log (logfile='%s')\n"
-           "-g wait for gdb on port 1234\n"
+           "wait for gdb on port 1234\n"
            "-p pagesize  set the host page size to 'pagesize'\n",
            TARGET_ARCH,
            TARGET_ARCH,
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/linux-user/main.c xen-3.4.2//tools/ioemu-qemu-xen/linux-user/main.c
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/linux-user/main.c	2009-11-05 19:44:56.000000000 +0800
+++ xen-3.4.2//tools/ioemu-qemu-xen/linux-user/main.c	2011-09-26 22:57:19.285759748 +0800
@@ -2186,7 +2186,7 @@
            "\n"
            "Standard options:\n"
            "-h                print this help\n"
-           "-g port           wait gdb connection to port\n"
+           "port           wait gdb connection to port\n"
            "-L path           set the elf interpreter prefix (default=%s)\n"
            "-s size           set the stack size in bytes (default=%ld)\n"
            "-cpu model        select CPU (-cpu ? for list)\n"
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/cris/Makefile xen-3.4.2//tools/ioemu-qemu-xen/tests/cris/Makefile
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/cris/Makefile	2009-11-05 19:44:56.000000000 +0800
+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/cris/Makefile	2011-09-26 22:57:19.021759748 +0800
@@ -12,9 +12,9 @@
 OBJCOPY = $(CROSS)objcopy
 
 # we rely on GCC inline:ing the stuff we tell it to in many places here.
-CFLAGS  = -Winline -Wall -g -O2 -static
+CFLAGS  = -Winline -Wall -static
 NOSTDFLAGS = -nostartfiles -nostdlib
-ASFLAGS += -g -Wa,-I,$(SRC_PATH)/tests/cris/
+ASFLAGS += -Wa,-I,$(SRC_PATH)/tests/cris/
 LDLIBS  =
 NOSTDLIBS = -lgcc
 
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/hello-mips.c xen-3.4.2//tools/ioemu-qemu-xen/tests/hello-mips.c
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/hello-mips.c	2009-11-05 19:44:56.000000000 +0800
+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/hello-mips.c	2011-09-26 22:57:18.950759748 +0800
@@ -6,7 +6,7 @@
 * http://www.linux.com/howtos/Assembly-HOWTO/mips.shtml
 *
 * mipsel-linux-gcc -nostdlib -mno-abicalls -fno-PIC -mabi=32 \
-*                  -O2 -static -o hello-mips hello-mips.c
+*                  -static -o hello-mips hello-mips.c
 *
 */
 #define __NR_SYSCALL_BASE	4000
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/Makefile xen-3.4.2//tools/ioemu-qemu-xen/tests/Makefile
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/Makefile	2009-11-05 19:44:56.000000000 +0800
+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/Makefile	2011-09-26 22:57:19.022759748 +0800
@@ -2,7 +2,7 @@
 -include ../config-host.mak
 VPATH=$(SRC_PATH)/tests
 
-CFLAGS=-Wall -O2 -g -fno-strict-aliasing
+CFLAGS=-Wall -fno-strict-aliasing
 #CFLAGS+=-msse2
 LDFLAGS=
 
@@ -52,7 +52,7 @@
 
 .PHONY: test-mmap
 test-mmap: test-mmap.c
-	$(CC) $(CFLAGS) -Wall -static -O2 $(LDFLAGS) -o $@ $<
+	$(CC) $(CFLAGS) -Wall -static $(LDFLAGS) -o $@ $<
 	-./test-mmap
 	-$(QEMU) ./test-mmap
 	-$(QEMU) -p 8192 ./test-mmap 8192
@@ -88,17 +88,17 @@
 	arm-linux-ld -o $@ $<
 
 hello-arm.o: hello-arm.c
-	arm-linux-gcc -Wall -g -O2 -c -o $@ $<
+	arm-linux-gcc -Wall -c -o $@ $<
 
 test-arm-iwmmxt: test-arm-iwmmxt.s
 	cpp < $< | arm-linux-gnu-gcc -Wall -static -march=iwmmxt -mabi=aapcs -x assembler - -o $@
 
 # MIPS test
 hello-mips: hello-mips.c
-	mips-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -O2 -o $@ $<
+	mips-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -o $@ $<
 
 hello-mipsel: hello-mips.c
-	mipsel-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -O2 -o $@ $<
+	mipsel-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -o $@ $<
 
 # testsuite for the CRIS port.
 test-cris:
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/vl.c xen-3.4.2//tools/ioemu-qemu-xen/vl.c
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/vl.c	2009-11-05 19:44:56.000000000 +0800
+++ xen-3.4.2//tools/ioemu-qemu-xen/vl.c	2011-09-26 22:57:19.324759748 +0800
@@ -4046,7 +4046,7 @@
            "                select video card type\n"
            "-full-screen    start in full screen\n"
 #if defined(TARGET_PPC) || defined(TARGET_SPARC)
-           "-g WxH[xDEPTH]  Set the initial graphical resolution and depth\n"
+           "WxH[xDEPTH]  Set the initial graphical resolution and depth\n"
 #endif
            "-vnc display    start a VNC server on display\n"
            "\n"
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/xen-setup-stubdom xen-3.4.2//tools/ioemu-qemu-xen/xen-setup-stubdom
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/xen-setup-stubdom	2009-11-05 19:44:56.000000000 +0800
+++ xen-3.4.2//tools/ioemu-qemu-xen/xen-setup-stubdom	2011-09-26 22:57:19.329759748 +0800
@@ -91,7 +91,7 @@
 -include \$(QEMU_ROOT)/xen-hooks.mak
 HOST_USB=stub
 
-HOST_LDFLAGS= \$(LDFLAGS) -g -Wl,--warn-common
+HOST_LDFLAGS= \$(LDFLAGS) -Wl,--warn-common
 HOST_CFLAGS= \$(CFLAGS)
 CPPFLAGS += $TARGET_CPPFLAGS -DCONFIG_STUBDOM
 CFLAGS= $TARGET_CFLAGS
diff -ur xen-3.4.2.orig//tools/libaio/harness/Makefile xen-3.4.2//tools/libaio/harness/Makefile
--- xen-3.4.2.orig//tools/libaio/harness/Makefile	2011-09-26 22:51:41.066759896 +0800
+++ xen-3.4.2//tools/libaio/harness/Makefile	2011-09-26 22:57:19.045759748 +0800
@@ -4,7 +4,7 @@
 HARNESS_SRCS:=main.c
 # io_queue.c
 
-CFLAGS=-Wall  -g -O -laio
+CFLAGS=-Wall  -O -laio
 #-lpthread -lrt
 
 all: $(PROGS)
diff -ur xen-3.4.2.orig//tools/libaio/src/Makefile xen-3.4.2//tools/libaio/src/Makefile
--- xen-3.4.2.orig//tools/libaio/src/Makefile	2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/libaio/src/Makefile	2011-09-26 22:57:19.044759748 +0800
@@ -6,7 +6,7 @@
 libdir=$(prefix)/lib
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/)
-CFLAGS = -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
+CFLAGS = -nostdlib -nostartfiles -Wall -I. -fomit-frame-pointer -fPIC
 SO_CFLAGS=-shared $(CFLAGS)
 L_CFLAGS=$(CFLAGS)
 LINK_FLAGS=
diff -ur xen-3.4.2.orig//tools/libxc/Makefile xen-3.4.2//tools/libxc/Makefile
--- xen-3.4.2.orig//tools/libxc/Makefile	2011-09-26 22:51:41.067759896 +0800
+++ xen-3.4.2//tools/libxc/Makefile	2011-09-26 22:57:19.059759748 +0800
@@ -60,7 +60,7 @@
 
 # Define this to make it possible to run valgrind on code linked with these
 # libraries.
-#CFLAGS   += -DVALGRIND -O0 -ggdb3
+#CFLAGS   += -DVALGRIND -O0gdb3
 
 LDFLAGS  += -L.
 
diff -ur xen-3.4.2.orig//tools/libxen/Makefile.dist xen-3.4.2//tools/libxen/Makefile.dist
--- xen-3.4.2.orig//tools/libxen/Makefile.dist	2011-09-26 22:51:41.067759896 +0800
+++ xen-3.4.2//tools/libxen/Makefile.dist	2011-09-26 22:57:18.813759748 +0800
@@ -22,7 +22,7 @@
 CFLAGS = -Iinclude                     \
          $(shell xml2-config --cflags) \
          $(shell curl-config --cflags) \
-         -W -Wall -Wmissing-prototypes  -std=c99 -O2 -fPIC
+         -W -Wall -Wmissing-prototypes  -std=c99 -fPIC
 
 LDFLAGS = $(shell xml2-config --libs) \
           $(shell curl-config --libs)
diff -ur xen-3.4.2.orig//tools/python/test.py xen-3.4.2//tools/python/test.py
--- xen-3.4.2.orig//tools/python/test.py	2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/python/test.py	2011-09-26 22:57:19.339759748 +0800
@@ -99,12 +99,12 @@
     Note that functional tests will be skipped if the module
     zope.app.tests.functional cannot be imported.
 
--g threshold
+threshold
 --gc-threshold threshold
     Set the garbage collector generation0 threshold.  This can be used
     to stress memory and gc correctness.  Some crashes are only
     reproducible when the threshold is set to 1 (agressive garbage
-    collection).  Do "-g 0" to disable garbage collection altogether.
+    collection).  Do "0" to disable garbage collection altogether.
 
 -G gc_option
 --gc-option gc_option
diff -ur xen-3.4.2.orig//tools/python/xen/util/vscsi_util.py xen-3.4.2//tools/python/xen/util/vscsi_util.py
--- xen-3.4.2.orig//tools/python/xen/util/vscsi_util.py	2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/python/xen/util/vscsi_util.py	2011-09-26 22:57:19.343759748 +0800
@@ -96,7 +96,7 @@
 
     devices = []
 
-    for scsiinfo in os.popen('{ lsscsi -g %s; } 2>/dev/null' % option).readlines():
+    for scsiinfo in os.popen('{ lsscsi %s; } 2>/dev/null' % option).readlines():
         s = scsiinfo.split()
         hctl = s[0][1:-1]
         try:
diff -ur xen-3.4.2.orig//tools/security/Makefile xen-3.4.2//tools/security/Makefile
--- xen-3.4.2.orig//tools/security/Makefile	2011-09-26 22:51:41.067759896 +0800
+++ xen-3.4.2//tools/security/Makefile	2011-09-26 22:57:19.073759748 +0800
@@ -76,7 +76,7 @@
 	chmod 700 $(ACM_SCRIPTS)
 
 xensec_tool: $(OBJS_TOOL)
-	$(CC) -g $(CFLAGS) $(LDFLAGS) -O0 -o $@ $^ $(LDFLAGS_libxenctrl)
+	$(CC) $(CFLAGS) $(LDFLAGS) -O0 -o $@ $^ $(LDFLAGS_libxenctrl)
 
 xensec_gen: xensec_gen.py
 	cp -f $^ $@
diff -ur xen-3.4.2.orig//tools/vnet/libxutil/Makefile xen-3.4.2//tools/vnet/libxutil/Makefile
--- xen-3.4.2.orig//tools/vnet/libxutil/Makefile	2011-09-26 22:51:41.068759896 +0800
+++ xen-3.4.2//tools/vnet/libxutil/Makefile	2011-09-26 22:57:19.064759748 +0800
@@ -26,8 +26,8 @@
 
 $(call cc-option-add,CFLAGS,CC,-fgnu89-inline)
 CFLAGS   +=  -fno-strict-aliasing
-CFLAGS   += -O3
-#CFLAGS   += -g
+#CFLAGS   += -O3
+#CFLAGS   +=
 
 MAJOR    := 3.0
 MINOR    := 0
diff -ur xen-3.4.2.orig//tools/vnet/vnetd/Makefile xen-3.4.2//tools/vnet/vnetd/Makefile
--- xen-3.4.2.orig//tools/vnet/vnetd/Makefile	2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/vnet/vnetd/Makefile	2011-09-26 22:59:29.467759690 +0800
@@ -44,7 +44,7 @@
 CPPFLAGS += -D __ARCH_I386_ATOMIC__
 
 #----------------------------------------------------------------------------
-CFLAGS += -O3
+#CFLAGS += -O3
 CFLAGS += $(INCLUDES) $(LIBS)
 
 LDFLAGS += $(LIBS)
diff -ur xen-3.4.2.orig//tools/vnet/vnet-module/Makefile-2.4 xen-3.4.2//tools/vnet/vnet-module/Makefile-2.4
--- xen-3.4.2.orig//tools/vnet/vnet-module/Makefile-2.4	2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/vnet/vnet-module/Makefile-2.4	2011-09-26 23:00:53.791759661 +0800
@@ -61,8 +61,8 @@
 CFLAGS += -Wno-unused-function
 CFLAGS += -Wno-unused-parameter 
 
-CFLAGS += -g
-CFLAGS += -O2
+#CFLAGS += -g
+#CFLAGS += -O2
 CFLAGS += -fno-strict-aliasing 
 CFLAGS += -fno-common 
 #CFLAGS += -fomit-frame-pointer
diff -ur xen-3.4.2.orig//tools/vtpm/Rules.mk xen-3.4.2//tools/vtpm/Rules.mk
--- xen-3.4.2.orig//tools/vtpm/Rules.mk	2011-09-26 22:51:41.068759896 +0800
+++ xen-3.4.2//tools/vtpm/Rules.mk	2011-09-26 22:57:19.257759748 +0800
@@ -9,7 +9,7 @@
 TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
 
 # General compiler flags
-CFLAGS   =  -g3 -I.
+CFLAGS   = 3 -I.
 
 # Generic project files
 HDRS	= $(wildcard *.h)
diff -ur xen-3.4.2.orig//tools/vtpm/tpm_emulator.patch xen-3.4.2//tools/vtpm/tpm_emulator.patch
--- xen-3.4.2.orig//tools/vtpm/tpm_emulator.patch	2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/vtpm/tpm_emulator.patch	2011-09-26 22:57:19.360759748 +0800
@@ -434,7 +434,7 @@
  VERSION_BUILD  := $(shell date +"%s")
  
 -# enable/disable DEBUG messages
--EXTRA_CFLAGS   += -Wall -DDEBUG -g  
+-EXTRA_CFLAGS   += -Wall -DDEBUG  
 +# Installation program and options
 +INSTALL         = install
 +INSTALL_PROG    = $(INSTALL) -m0755
@@ -444,7 +444,7 @@
 +TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
 +
 +CC      := gcc
-+CFLAGS  += -g -Wall $(INCLUDE) -DDEBUG
++CFLAGS  += -Wall $(INCLUDE) -DDEBUG
 +CFLAGS  += -I. -Itpm
 +
 +# Is the simulator running in it's own vm?
diff -ur xen-3.4.2.orig//tools/vtpm/vtpm.patch xen-3.4.2//tools/vtpm/vtpm.patch
--- xen-3.4.2.orig//tools/vtpm/vtpm.patch	2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/vtpm/vtpm.patch	2011-09-26 22:57:19.349759748 +0800
@@ -69,7 +69,7 @@
 @@ -22,7 +22,7 @@ TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
  
  CC      := gcc
- CFLAGS  += -g -Wall $(INCLUDE) -DDEBUG
+ CFLAGS  += -Wall $(INCLUDE) -DDEBUG
 -CFLAGS  += -I. -Itpm
 +CFLAGS  += -I. -Itpm -I../../vtpm_manager/manager
  
diff -ur xen-3.4.2.orig//tools/vtpm_manager/Rules.mk xen-3.4.2//tools/vtpm_manager/Rules.mk
--- xen-3.4.2.orig//tools/vtpm_manager/Rules.mk	2011-09-26 22:51:41.068759896 +0800
+++ xen-3.4.2//tools/vtpm_manager/Rules.mk	2011-09-26 22:57:19.256759748 +0800
@@ -9,7 +9,7 @@
 TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
 
 # General compiler flags
-CFLAGS	=  -g3 -I.
+CFLAGS	= 3 -I.
 
 # Generic project files
 HDRS	= $(wildcard *.h)
diff -ur xen-3.4.2.orig//xen/arch/ia64/Rules.mk xen-3.4.2//xen/arch/ia64/Rules.mk
--- xen-3.4.2.orig//xen/arch/ia64/Rules.mk	2011-09-26 22:51:41.069759896 +0800
+++ xen-3.4.2//xen/arch/ia64/Rules.mk	2011-09-26 22:57:19.264759748 +0800
@@ -42,7 +42,7 @@
 #CFLAGS  += -Wno-pointer-arith -Wredundant-decls
 CFLAGS	+= -DIA64 -DXEN -DLINUX_2_6
 CFLAGS	+= -ffixed-r13 -mfixed-range=f2-f5,f12-f127,b2-b5
-CFLAGS	+= -g
+CFLAGS	+=
 ifeq ($(vti_debug),y)
 CFLAGS  += -DVTI_DEBUG
 endif
@@ -85,4 +85,4 @@
 CFLAGS += -DCONFIG_IA64_PICKLE_DOMAIN
 endif
 
-LDFLAGS = -g
+LDFLAGS =
diff -ur xen-3.4.2.orig//xen/arch/ia64/tools/privify/Makefile xen-3.4.2//xen/arch/ia64/tools/privify/Makefile
--- xen-3.4.2.orig//xen/arch/ia64/tools/privify/Makefile	2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//xen/arch/ia64/tools/privify/Makefile	2011-09-26 22:57:19.168759748 +0800
@@ -1,9 +1,9 @@
 privify: privify_elf64.o privify.o
-	gcc -g privify.o privify_elf64.o -o privify
+	gcc privify.o privify_elf64.o -o privify
 
 
 privify_elf64.o: privify_elf64.c
-	gcc -g -D__KERNEL__ -c privify_elf64.c
+	gcc -D__KERNEL__ -c privify_elf64.c
 
 privify.o: privify.c
-	gcc -nostdinc -g -D__KERNEL__ -c privify.c
+	gcc -nostdinc -D__KERNEL__ -c privify.c
diff -ur xen-3.4.2.orig//xen/Rules.mk xen-3.4.2//xen/Rules.mk
--- xen-3.4.2.orig//xen/Rules.mk	2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//xen/Rules.mk	2011-09-26 22:57:19.269759748 +0800
@@ -40,7 +40,7 @@
 ALL_OBJS-y               += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o
 ALL_OBJS-$(x86)          += $(BASEDIR)/crypto/built_in.o
 
-CFLAGS-y                += -g -D__XEN__
+CFLAGS-y                += -D__XEN__
 CFLAGS-$(XSM_ENABLE)    += -DXSM_ENABLE
 CFLAGS-$(FLASK_ENABLE)  += -DFLASK_ENABLE -DXSM_MAGIC=0xf97cff8c
 CFLAGS-$(FLASK_ENABLE)  += -DFLASK_DEVELOP -DFLASK_BOOTPARAM -DFLASK_AVC_STATS