Clobber registers as appropriate in AMD CAR code, and

[coreboot.git] / Makefile

diff --git a/Makefile b/Makefile
index ab4c2a5464bd1305cafa79744608e8f4f468ef21..f9f17f69e93fa4bb7a4a1ca719bc09c92dfc624b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -253,7 +253,7 @@ $(obj)/build.h:
        printf "/* build system definitions (autogenerated) */\n" > $(obj)/build.ht
        printf "#ifndef __BUILD_H\n" >> $(obj)/build.ht
        printf "#define __BUILD_H\n\n" >> $(obj)/build.ht
-       printf "#define COREBOOT_VERSION \"$(KERNELVERSION)\"\n" >> $(obj)/build.ht
+       printf "#define COREBOOT_VERSION \"$(KERNELVERSION)-r$(shell if [ -d $(top)/.svn -a -f `which svnversion` ]; then svnversion $(top); else if [ -d $(top)/.git -a -f `which git` ]; then git --git-dir=/$(top)/.git log|grep git-svn-id|cut -f 2 -d@|cut -f 1 -d' '|sort -g|tail -1; fi; fi)\"\n" >> $(obj)/build.ht
        printf "#define COREBOOT_EXTRA_VERSION \"$(COREBOOT_EXTRA_VERSION)\"\n" >> $(obj)/build.ht
        printf "#define COREBOOT_BUILD \"`LANG= date`\"\n" >> $(obj)/build.ht
        printf "\n" >> $(obj)/build.ht
@@ -312,7 +312,9 @@ ifeq ($(_OS),CYGWIN_)
 endif
 $(obj)/romcc: $(top)/util/romcc/romcc.c
        @printf "    HOSTCC     $(subst $(obj)/,,$(@)) (this may take a while)\n"
-       $(HOSTCC) -g -O2 $(STACK) -Wall -o $@ $<
+       @# Note: Adding -O2 here might cause problems. For details see:
+       @# http://www.coreboot.org/pipermail/coreboot/2010-February/055825.html
+       $(HOSTCC) -g $(STACK) -Wall -o $@ $<
 
 .PHONY: $(PHONY) prepare prepare2 clean distclean doxygen doxy coreboot