r3073 - in trunk/coreboot-v2: src/config targets

Author: hailfinger
Date: 2008-01-22 17:09:36 +0100 (Tue, 22 Jan 2008)
New Revision: 3073

Modified:
   trunk/coreboot-v2/src/config/Config.lb
   trunk/coreboot-v2/targets/buildtarget
Log:
Use "--build-id=none" as linker flags if build-id is supported.
That fixes a compilation failure.

Signed-off-by: Marc Karasek  
Signed-off-by: Carl-Daniel Hailfinger 
Acked-by: Joseph Smith 
Acked-by: Myles Watson

Modified: trunk/coreboot-v2/src/config/Config.lb
===================================================================
--- trunk/coreboot-v2/src/config/Config.lb	2008-01-22 16:03:19 UTC (rev 3072)
+++ trunk/coreboot-v2/src/config/Config.lb	2008-01-22 16:09:36 UTC (rev 3073)
@@ -8,7 +8,7 @@
 makedefine GCC_INC_DIR := $(shell LC_ALL=C $(CC) -print-search-dirs | sed -ne "s/install: (.*)/\1include/gp")

makedefine CPPFLAGS := -I$(TOP)/src/include -I$(TOP)/src/arch/$(ARCH)/include -I$(GCC_INC_DIR) $(CPUFLAGS)
-makedefine CFLAGS := $(CPU_OPT) $(CPPFLAGS) -Os -nostdinc -nostdlib -fno-builtin  -Wall
+makedefine CFLAGS := $(CPU_OPT) $(DISTRO_CFLAGS) $(CPPFLAGS) -Os -nostdinc -nostdlib -fno-builtin  -Wall

makedefine HOSTCFLAGS:= -Os -Wall

@@ -38,14 +38,15 @@
         action  "ar cr coreboot.a $(OBJECTS)"
 end

+
 makerule coreboot_ram.o
    depends	"$(DRIVER) coreboot.a $(LIBGCC_FILE_NAME)" 
-	action	"$(CC) -nostdlib -r -o $@ c_start.o $(DRIVER) coreboot.a $(LIBGCC_FILE_NAME)"
+	action	"$(CC) $(DISTRO_LFLAGS) -nostdlib -r -o $@ c_start.o $(DRIVER) coreboot.a $(LIBGCC_FILE_NAME)"
 end

makerule coreboot_ram
    depends	"coreboot_ram.o $(TOP)/src/config/coreboot_ram.ld ldoptions" 
-	action	"$(CC) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/coreboot_ram.ld coreboot_ram.o"
+	action	"$(CC) $(DISTRO_LFLAGS) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/coreboot_ram.ld coreboot_ram.o"
    action 	"$(CROSS_COMPILE)nm -n coreboot_ram | sort > coreboot_ram.map"
 end

@@ -83,12 +84,12 @@

makerule coreboot_apc.o
    	depends "coreboot_apc.a c_start.o $(LIBGCC_FILE_NAME)"
-        action  "$(CC) -nostdlib -r -o $@ c_start.o coreboot_apc.a $(LIBGCC_FILE_NAME)"
+        action  "$(CC) $(DISTRO_LFLAGS) -nostdlib -r -o $@ c_start.o coreboot_apc.a $(LIBGCC_FILE_NAME)"
    end

makerule coreboot_apc
    	depends "coreboot_apc.o $(TOP)/src/config/coreboot_apc.ld ldoptions"
-		action  "$(CC) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/coreboot_apc.ld coreboot_apc.o"
+		action  "$(CC) $(DISTRO_LFLAGS) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/coreboot_apc.ld coreboot_apc.o"
    	action  "$(CROSS_COMPILE)nm -n coreboot_apc | sort > coreboot_apc.map"
    end

@@ -121,7 +122,7 @@

makerule coreboot   
    depends	"crt0.o $(INIT-OBJECTS) $(COREBOOT_APC) $(COREBOOT_RAM_ROM) ldscript.ld"
-	action	"$(CC) -nostdlib -nostartfiles -static -o $@ -T ldscript.ld crt0.o $(INIT-OBJECTS)"
+	action	"$(CC) $(DISTRO_LFLAGS) -nostdlib -nostartfiles -static -o $@ -T ldscript.ld crt0.o $(INIT-OBJECTS)"
    action	"$(CROSS_COMPILE)nm -n coreboot | sort > coreboot.map"
 end

Modified: trunk/coreboot-v2/targets/buildtarget
===================================================================
--- trunk/coreboot-v2/targets/buildtarget	2008-01-22 16:03:19 UTC (rev 3072)
+++ trunk/coreboot-v2/targets/buildtarget	2008-01-22 16:09:36 UTC (rev 3073)
@@ -69,9 +69,16 @@

rm -rf .$$.tmp

+ld --help | awk '{for (i=1;i<=NF;i++) if ($i ~ /build-id/){n++} }; END {exit n}' 
+build_id=$?
+if [ $build_id -ge 1 ] ; then
+	EXTRA_LFLAGS+=" -Wl,--build-id=none"
+fi
+
 for i in $build_dir/Makefile.settings $build_dir/*/Makefile.settings
 do
-	echo CFLAGS+=$EXTRA_CFLAGS >>$i
+	echo DISTRO_CFLAGS+=$EXTRA_CFLAGS >>$i
+	echo DISTRO_LFLAGS+=$EXTRA_LFLAGS >>$i
 done

exit $?