[openfirmware] [commit] r2361 - clients/emacs/arm clients/lib/arm cpu/arm/olpc/1.75

[repository service]

Author: quozl
Date: Thu Jul 14 07:39:10 2011
New Revision: 2361
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2361

Log:
OLPC XO-1.75, move raise() noop function to library and fix build on koji2

Modified:
   clients/emacs/arm/Makefile
   clients/lib/arm/start.c
   cpu/arm/olpc/1.75/mcnand-version.fth

Modified: clients/emacs/arm/Makefile
==============================================================================
--- clients/emacs/arm/Makefile	Thu Jul 14 06:01:01 2011	(r2360)
+++ clients/emacs/arm/Makefile	Thu Jul 14 07:39:10 2011	(r2361)
@@ -4,10 +4,16 @@
 #	      or just: make	
 #
 
-TOOLPREFIX=/usr/local/arm/bin/arm-linux-
-CC=$(TOOLPREFIX)gcc
-LD=$(TOOLPREFIX)ld
-STRIP=$(TOOLPREFIX)strip
+ifneq (arm, $(findstring arm,$(shell uname -p)))
+  # Cross-compiler setup
+  TOOLPREFIX=/usr/local/arm/bin/arm-linux-
+  CC=$(TOOLPREFIX)gcc
+  LD=$(TOOLPREFIX)ld
+  STRIP=$(TOOLPREFIX)strip
+else
+  CC    := gcc
+  STRIP := strip
+endif
 
 BP=../../..
 SRCDIR=..
@@ -19,6 +25,10 @@
 MODES=-g -O2 -fno-inline
 CFLAGS= $(INCS) $(MODES)
 
+ifeq (y, $(shell $(CC) -xc -c -fno-stack-protector /dev/null -o /dev/null 2>/dev/null && echo y))
+  CFLAGS += -fno-stack-protector
+endif
+
 LFLAGS= 	-T emacs.lds -N -e _start
 
 HFILES=		../estruct.h edef.h efunc.h epath.h ebind.h

Modified: clients/lib/arm/start.c
==============================================================================
--- clients/lib/arm/start.c	Thu Jul 14 06:01:01 2011	(r2360)
+++ clients/lib/arm/start.c	Thu Jul 14 07:39:10 2011	(r2361)
@@ -27,6 +27,10 @@
     cif_handler(argarray);
 }
 
+void raise()
+{
+}
+
 // LICENSE_BEGIN
 // Copyright (c) 2006 FirmWorks
 // 

Modified: cpu/arm/olpc/1.75/mcnand-version.fth
==============================================================================
--- cpu/arm/olpc/1.75/mcnand-version.fth	Thu Jul 14 06:01:01 2011	(r2360)
+++ cpu/arm/olpc/1.75/mcnand-version.fth	Thu Jul 14 07:39:10 2011	(r2361)
@@ -3,7 +3,6 @@
 \ With a specific ID, mcastnand.bth will download a tarball without .git stuff.
 \ With "test", mcastnand.bth will clone the git head if build/multicast-nand/
 \ is not already present, then you can modify the git subtree as needed.
-macro: MCNAND_VERSION 059bd03137c19d67a28c67665c4ce50fd5d35565
-
+macro: MCNAND_VERSION 6c53cac2dba11d6d0f0a6d7607b2f831d566356b
 \ macro: MCNAND_VERSION test
 \ macro: MCNAND_VERSION HEAD