Gentoo Archives: gentoo-commits

From: "Stratos Psomadakis (psomas)" <psomas@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] linux-patches r1971 - genpatches-2.6/trunk/2.6.32
Date: Mon, 29 Aug 2011 23:08:39
Message-Id: 20110829230829.14A292004C@flycatcher.gentoo.org
1 Author: psomas
2 Date: 2011-08-29 23:08:28 +0000 (Mon, 29 Aug 2011)
3 New Revision: 1971
4
5 Added:
6 genpatches-2.6/trunk/2.6.32/2901_kbuild-fix-passing-wno-options-to-gcc-4.4.patch
7 Modified:
8 genpatches-2.6/trunk/2.6.32/0000_README
9 genpatches-2.6/trunk/2.6.32/2900_disable-wunused-but-set-var-gcc-4-6-0.patch
10 Log:
11 Fix passing -Wno options to gcc-4.4
12
13 Modified: genpatches-2.6/trunk/2.6.32/0000_README
14 ===================================================================
15 --- genpatches-2.6/trunk/2.6.32/0000_README 2011-08-29 22:34:50 UTC (rev 1970)
16 +++ genpatches-2.6/trunk/2.6.32/0000_README 2011-08-29 23:08:28 UTC (rev 1971)
17 @@ -231,6 +231,10 @@
18 From: https://bugs.gentoo.org/show_bug.cgi?id=366579
19 Desc: Disable -Wunused-but-set-variable for gcc 4.6.0. Thanks to Stratos Psomadakis
20
21 +Patch: 2901_kbuild-fix-passing-wno-options-to-gcc-4.4.patch
22 +From: https://patchwork.kernel.org/patch/1010172/
23 +Desc: Fix passing -Wno options to gcc-4.4
24 +
25 Patch: 4200_fbcondecor-0.9.6.patch
26 From: http://dev.gentoo.org/~spock
27 Desc: Bootsplash successor by Michal Januszewski
28
29 Modified: genpatches-2.6/trunk/2.6.32/2900_disable-wunused-but-set-var-gcc-4-6-0.patch
30 ===================================================================
31 --- genpatches-2.6/trunk/2.6.32/2900_disable-wunused-but-set-var-gcc-4-6-0.patch 2011-08-29 22:34:50 UTC (rev 1970)
32 +++ genpatches-2.6/trunk/2.6.32/2900_disable-wunused-but-set-var-gcc-4-6-0.patch 2011-08-29 23:08:28 UTC (rev 1971)
33 @@ -1,9 +1,10 @@
34 ---- a/Makefile 2011-06-24 14:52:17.601982186 -0400
35 -+++ b/Makefile 2011-06-24 14:54:05.335994115 -0400
36 -@@ -537,6 +537,8 @@ ifndef CONFIG_CC_STACKPROTECTOR
37 +--- linux-2.6.32.orig/Makefile
38 ++++ linux-2.6.32/Makefile
39 +@@ -537,6 +537,9 @@ ifndef CONFIG_CC_STACKPROTECTOR
40 KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)
41 endif
42
43 ++# This warning generated too much noise in a regular build.
44 +KBUILD_CFLAGS += $(call cc-option, -Wno-unused-but-set-variable)
45 +
46 ifdef CONFIG_FRAME_POINTER
47
48 Added: genpatches-2.6/trunk/2.6.32/2901_kbuild-fix-passing-wno-options-to-gcc-4.4.patch
49 ===================================================================
50 --- genpatches-2.6/trunk/2.6.32/2901_kbuild-fix-passing-wno-options-to-gcc-4.4.patch (rev 0)
51 +++ genpatches-2.6/trunk/2.6.32/2901_kbuild-fix-passing-wno-options-to-gcc-4.4.patch 2011-08-29 23:08:28 UTC (rev 1971)
52 @@ -0,0 +1,55 @@
53 +--- linux-2.6.35.y.orig/Documentation/kbuild/makefiles.txt
54 ++++ linux-2.6.35.y/Documentation/kbuild/makefiles.txt
55 +@@ -502,6 +502,18 @@ more details, with real examples.
56 + gcc >= 3.00. For gcc < 3.00, -malign-functions=4 is used.
57 + Note: cc-option-align uses KBUILD_CFLAGS for $(CC) options
58 +
59 ++ cc-disable-warning
60 ++ cc-disable-warning checks if gcc supports a given warning and returns
61 ++ the commandline switch to disable it. This special function is needed,
62 ++ because gcc 4.4 and later accept any unknown -Wno-* option and only
63 ++ warn about it if there is another warning in the source file.
64 ++
65 ++ Example:
66 ++ KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
67 ++
68 ++ In the above example, -Wno-unused-but-set-variable will be added to
69 ++ KBUILD_CFLAGS only if gcc really accepts it.
70 ++
71 + cc-version
72 + cc-version returns a numerical version of the $(CC) compiler version.
73 + The format is <major><minor> where both are two digits. So for example
74 +--- linux-2.6.35.y.orig/Makefile
75 ++++ linux-2.6.35.y/Makefile
76 +@@ -547,7 +547,7 @@ KBUILD_CFLAGS += $(call cc-option, -fno-
77 + endif
78 +
79 + # This warning generated too much noise in a regular build.
80 +-KBUILD_CFLAGS += $(call cc-option, -Wno-unused-but-set-variable)
81 ++KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
82 +
83 + ifdef CONFIG_FRAME_POINTER
84 + KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
85 +@@ -577,7 +577,7 @@ CHECKFLAGS += $(NOSTDINC_FLAGS)
86 + KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
87 +
88 + # disable pointer signed / unsigned warnings in gcc 4.0
89 +-KBUILD_CFLAGS += $(call cc-option,-Wno-pointer-sign,)
90 ++KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign)
91 +
92 + # disable invalid "can't wrap" optimizations for signed / pointers
93 + KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow)
94 +--- linux-2.6.35.y.orig/scripts/Kbuild.include
95 ++++ linux-2.6.35.y/scripts/Kbuild.include
96 +@@ -118,6 +118,11 @@ cc-option-yn = $(call try-run,\
97 + cc-option-align = $(subst -functions=0,,\
98 + $(call cc-option,-falign-functions=0,-malign-functions=0))
99 +
100 ++# cc-disable-warning
101 ++# Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable)
102 ++cc-disable-warning = $(call try-run,\
103 ++ $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -W$(strip $(1)) -c -xc /dev/null -o "$$TMP",-Wno-$(strip $(1)))
104 ++
105 + # cc-version
106 + # Usage gcc-ver := $(call cc-version)
107 + cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))