New subject: v2: fam10 fix for -fno-stack-protector

28 Jan 2008

Nearly all the platforms are compiling in buildrom with Ubuntu now, except
for one.   This fixes that one.
Jordan
-- 
Jordan Crouse
Systems Software Development Engineer 
Advanced Micro Devices, Inc.

[V2]:  Add CFLAGS to targets to suck in any passed in flags

Signed-off-by: Jordan Crouse jordan.crouse@amd.com
Index: coreboot-v2/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb
===================================================================

--- coreboot-v2.orig/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb	2008-01-28 12:07:30.000000000 -0700
+++ coreboot-v2/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb	2008-01-28 12:07:52.000000000 -0700
@@ -136,14 +136,14 @@
    	# compile cache_as_ram.c to auto.o
    	makerule ./cache_as_ram_auto.o
    		depends "$(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) option_table.h"
-			action "$(CC) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o $@"
+			action "$(CC) -I$(TOP)/src -I. $(CFLAGS) $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o $@"
    	end

    else
    	#compile cache_as_ram.c to auto.inc
    	makerule ./cache_as_ram_auto.inc
    		depends "$(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) option_table.h"
-			action "$(CC) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin -Wall -c -S -o $@"
+			action "$(CC) -I$(TOP)/src -I. $(CFLAGS) $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin -Wall -c -S -o $@"
    		action "perl -e 's/.rodata/.rom.data/g' -pi $@"
    		action "perl -e 's/.text/.section .rom.text/g' -pi $@"
    	end
@@ -156,7 +156,7 @@
     if CONFIG_AP_CODE_IN_CAR
     makerule ./apc_auto.o
    	 depends "$(MAINBOARD)/apc_auto.c option_table.h"
-		 action "$(CC) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/apc_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o $@"
+		 action "$(CC) -I$(TOP)/src -I. $(CFLAGS) $(CPPFLAGS) $(MAINBOARD)/apc_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o $@"
     end
     ldscript /arch/i386/init/ldscript_apc.lb
     end

    