[PATCH] patsubstfor LOCALVERSION and -fno-omit-frame-pointer

[PATCH] patsubstfor LOCALVERSION and -fno-omit-frame-pointer

[Tejun Heo]

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

 (** Sorry, I'm resending this mail.  I had written the subject in the
Reply-To field. **)

 Hello, I'm attaching two patches for the top Makefile.

 The first patch modifies LOCALVERSION definition such taht it uses
patsubst instead of subst to remove surrounding double quotes from
CONFIG_LOCALVERSION.  This helps syntax-highlighting editors.

 The second patch addes -fno-omit-frame-pointer to CFLAGS when
CONFIG_FRAME_POINTER is set.  My gcc (gcc-3.3.4 Debian 1:3.3.4-11)
automatically turns on -fomit-frame-pointer when -O2 is specified and
thus breaks CONFIG_FRAME_POINTER option.  I'm not sure if other
versions of gcc wouldn't choke with -fno-omit-frame-pointer.  My 2.95
(2.95.4) seems to be OK though.

-- 
tejun


[-- Attachment #2: patsubst_localversion.patch --]
[-- Type: text/plain, Size: 884 bytes --]

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/09/12 16:29:12+09:00 tj@htj.dyndns.org 
#   Use patsubst instead of subst to remove surrounding double quotes
#   from CONFIG_LOCALVERSION.  This helps syntax-highlighting editors.
# 
# Makefile
#   2004/09/12 16:29:06+09:00 tj@htj.dyndns.org +1 -1
#   Use patsubst instead of subst to remove surrounding double quotes
#   from CONFIG_LOCALVERSION.  This helps syntax-highlighting editors.
# 
diff -Nru a/Makefile b/Makefile
--- a/Makefile	2004-09-12 18:04:33 +09:00
+++ b/Makefile	2004-09-12 18:04:33 +09:00
@@ -157,7 +157,7 @@
 
 LOCALVERSION = $(subst $(space),, \
 	       $(shell cat /dev/null $(localversion-files)) \
-	       $(subst ",,$(CONFIG_LOCALVERSION)))
+	       $(patsubst "%",%,$(CONFIG_LOCALVERSION)))
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)$(LOCALVERSION)
 

[-- Attachment #3: noomitframepointer.patch --]
[-- Type: text/plain, Size: 883 bytes --]

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/09/12 16:31:46+09:00 tj@htj.dyndns.org 
#   Newer gcc versions automatically turns on -fomit-frame-pointer when
#   -O2 is specified thus breaking CONFIG_FRAME_POINTER option.
#   Explicitly specifying -fno-omit-frame-pointer fixes it.
# 
# Makefile
#   2004/09/12 16:31:40+09:00 tj@htj.dyndns.org +3 -1
#   Newer gcc versions automatically turns on -fomit-frame-pointer when
#   -O2 is specified thus breaking CONFIG_FRAME_POINTER option.
#   Explicitly specifying -fno-omit-frame-pointer fixes it.
# 
diff -Nru a/Makefile b/Makefile
--- a/Makefile	2004-09-12 18:04:54 +09:00
+++ b/Makefile	2004-09-12 18:04:54 +09:00
@@ -486,7 +486,9 @@
 CFLAGS		+= -O2
 endif
 
-ifndef CONFIG_FRAME_POINTER
+ifdef CONFIG_FRAME_POINTER
+CFLAGS		+= -fno-omit-frame-pointer
+else
 CFLAGS		+= -fomit-frame-pointer
 endif
 

Re: [PATCH] patsubstfor LOCALVERSION and -fno-omit-frame-pointer

[Sam Ravnborg]

On Sun, Sep 12, 2004 at 06:36:35PM +0900, Tejun Heo wrote:
>  (** Sorry, I'm resending this mail.  I had written the subject in the
> Reply-To field. **)
> 
>  Hello, I'm attaching two patches for the top Makefile.
> 
>  The first patch modifies LOCALVERSION definition such taht it uses
> patsubst instead of subst to remove surrounding double quotes from
> CONFIG_LOCALVERSION.  This helps syntax-highlighting editors.
> 
>  The second patch addes -fno-omit-frame-pointer to CFLAGS when
> CONFIG_FRAME_POINTER is set.  My gcc (gcc-3.3.4 Debian 1:3.3.4-11)
> automatically turns on -fomit-frame-pointer when -O2 is specified and
> thus breaks CONFIG_FRAME_POINTER option.  I'm not sure if other
> versions of gcc wouldn't choke with -fno-omit-frame-pointer.  My 2.95
> (2.95.4) seems to be OK though.

Applied both.
Next time please send a single patch/mail.

	Sam