litmus-rt.git - The LITMUS^RT kernel.

diff options

author	Jory A. Pratt <anarchy@gentoo.org>	2009-09-18 15:49:31 -0400
committer	Sam Ravnborg <sam@ravnborg.org>	2009-09-20 06:27:43 -0400
commit	c47efe5548abbf53c2f66e06dcb46183b11d6b22 (patch)
tree	4d9326eebe4fb089e8de7abed73f1198189ff82c
parent	92f3f19c519d2eb18812a38312b05075cf0407db (diff)

kbuild: fix cc1 options check to ensure we do not use -fPIC when compiling

The arch/*/boot/Makefile use cc-options to check for GCC command options and cc-options use the hardened specs when checking for GCC command options. When -fPIE is pass to cc1 it can't use -ffreestanding or -fno-toplevel-reorder. Then it fail to build stuff with -ffreestanding and -fno-toplevel-reorder. Thanks to Fredric Johansson for finding the main problem behind a failed build using a hardened toolchain. Signed-off-by: Magnus Granberg <zorry@ume.nu> Signed-off-by: Jory A. Pratt <anarchy@gentoo.org> Cc: Fredric Johansson <johansson_fredric@hotmail.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Cc: <stable@kernel.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Diffstat

-rw-r--r--

scripts/Kbuild.include

1 files changed, 2 insertions, 2 deletions


diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index b3452601b0b1..4f9c1908593b 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include
@@ -106,12 +106,12 @@ as-instr = $(call try-run,\
106	# Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586)	106	# Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586)
107		107
108	cc-option = $(call try-run,\	108	cc-option = $(call try-run,\
109	$(CC) $(KBUILD_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP",$(1),$(2))	109	$(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP",$(1),$(2))
110		110
111	# cc-option-yn	111	# cc-option-yn
112	# Usage: flag := $(call cc-option-yn,-march=winchip-c6)	112	# Usage: flag := $(call cc-option-yn,-march=winchip-c6)
113	cc-option-yn = $(call try-run,\	113	cc-option-yn = $(call try-run,\
114	$(CC) $(KBUILD_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP",y,n)	114	$(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP",y,n)
115		115
116	# cc-option-align	116	# cc-option-align
117	# Prefix align with either -falign or -malign	117	# Prefix align with either -falign or -malign

53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247

304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363

/* * pm.h - Power management interface * * Copyright (C) 2000 Andrew Henroid * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _LINUX_PM_H #define _LINUX_PM_H #include <linux/list.h> /* * Callbacks for platform drivers to implement. */ extern void (*pm_idle)(void); extern void (*pm_power_off)(void); extern void (*pm_power_off_prepare)(void); /* * Device power management */ struct device; typedef struct pm_message { int event; } pm_message_t; /** * struct pm_ops - device PM callbacks * * Several driver power state transitions are externally visible, affecting * the state of pending I/O queues and (for drivers that touch hardware) * interrupts, wakeups, DMA, and other hardware state. There may also be * internal transitions to various low power modes, which are transparent * to the rest of the driver stack (such as a driver that's ON gating off * clocks which are not in active use). * * The externally visible transitions are handled with the help of the following * callbacks included in this structure: * * @prepare: Prepare the device for the upcoming transition, but do NOT change * its hardware state. Prevent new children of the device from being * registered after @prepare() returns (the driver's subsystem and * generally the rest of the kernel is supposed to prevent new calls to the * probe method from being made too once @prepare() has succeeded). If * @prepare() detects a situation it cannot handle (e.g. registration of a * child already in progress), it may return -EAGAIN, so that the PM core * can execute it once again (e.g. after the new child has been registered) * to recover from the race condition. This method is executed for all * kinds of suspend transitions and is followed by one of the suspend * callbacks: @suspend(), @freeze(), or @poweroff(). * The PM core executes @prepare() for all devices before starting to * execute suspend callbacks for any of them, so drivers may assume all of * the other devices to be present and functional while @prepare() is being * executed. In particular, it is safe to make GFP_KERNEL memory * allocations from within @prepare(). However, drivers may NOT assume * anything about the availability of the user space at that time and it * is not correct to request firmware from within @prepare() (it's too * late to do that). [To work around this limitation, drivers may * register suspend and hibernation notifiers that are executed before the * freezing of tasks.] * * @complete: Undo the changes made by @prepare(). This method is executed for * all kinds of resume transitions, following one of the resume callbacks: * @resume(), @thaw(), @restore(). Also called if the state transition * fails before the driver's suspend callback (@suspend(), @freeze(), * @poweroff()) can be executed (e.g. if the suspend callback fails for one * of the other devices that the PM core has unsuccessfully attempted to * suspend earlier). * The PM core executes @complete() after it has executed the appropriate * resume callback for all devices. * * @suspend: Executed before putting the system into a sleep state in which the * contents of main memory are preserved. Quiesce the device, put it into * a low power state appropriate for the upcoming system state (such as * PCI_D3hot), and enable wakeup events as appropriate. * * @resume: Executed after waking the system up from a sleep state in which the * contents of main memory were preserved. Put the device into the * appropriate state, according to the information saved in memory by the * preceding @suspend(). The driver starts working again, responding to * hardware events and software requests. The hardware may have gone * through a power-off reset, or it may have maintained state from the * previous suspend() which the driver may rely on while resuming. On most * platforms, there are no restrictions on availability of resources like * clocks during @resume(). * * @freeze: Hibernation-specific, executed before creating a hibernation image. * Quiesce operations so that a consistent image can be created, but do NOT * otherwise put the device into a low power device state and do NOT emit * system wakeup events. Save in main memory the device settings to be * used by @restore() during the subsequent resume from hibernation or by * the subsequent @thaw(), if the creation of the image or the restoration * of main memory contents from it fails. * * @thaw: Hibernation-specific, executed after creating a hibernation image OR * if the creation of the image fails. Also executed after a failing * attempt to restore the contents of main memory from such an image. * Undo the changes made by the preceding @freeze(), so the device can be * operated in the same way as immediately before the call to @freeze(). * * @poweroff: Hibernation-specific, executed after saving a hibernation image. * Quiesce the device, put it into a low power state appropriate for the * upcoming system state (such as PCI_D3hot), and enable wakeup events as * appropriate. * * @restore: Hibernation-specific, executed after restoring the contents of main * memory from a hibernation image. Driver starts working again, * responding to hardware events and software requests. Drivers may NOT * make ANY assumptions about the hardware state right prior to @restore(). * On most platforms, there are no restrictions on availability of * resources like clocks during @restore(). * * All of the above callbacks, except for @complete(), return error codes. * However, the error codes returned by the resume operations, @resume(), * @thaw(), and @restore(), do not cause the PM core to abort the resume * transition during which they are returned. The error codes returned in * that cases are only printed by the PM core to the system logs for debugging * purposes. Still, it is recommended that drivers only return error codes * from their resume methods in case of an unrecoverable failure (i.e. when the * device being handled refuses to resume and becomes unusable) to allow us to * modify the PM core in the future, so that it can avoid attempting to handle * devices that failed to resume and their children. * * It is allowed to unregister devices while the above callbacks are being * executed. However, it is not allowed to unregister a device from within any * of its own callbacks. */ struct pm_ops { int (*prepare)(struct device *dev); void (*complete)(struct device *dev); int (*suspend)(struct device *dev); int (*resume)(struct device *dev); int (*freeze)(struct device *dev); int (*thaw)(struct device *dev); int (*poweroff)(struct device *dev); int (*restore)(struct device *dev); }; /** * struct pm_ext_ops - extended device PM callbacks * * Some devices require certain operations related to suspend and hibernation * to be carried out with interrupts disabled. Thus, 'struct pm_ext_ops' below * is defined, adding callbacks to be executed with interrupts disabled to * 'struct pm_ops'. * * The following callbacks included in 'struct pm_ext_ops' are executed with


context:
space:
mode: