Patch merged into coreboot/master: x86: Move architecture selection from linker script to Makefile.inc

the following patch was just integrated into master:
commit 987493300df70c5635110f184922c829de247cfe
Author: Stefan Reinauer 
Date:   Tue Jun 23 12:57:06 2015 -0700

x86: Move architecture selection from linker script to Makefile.inc

Change-Id: I5efd3cb3e6970b5740f740507244a1ab823e0bb6
    Signed-off-by: Stefan Reinauer 
    Reviewed-on: http://review.coreboot.org/10590
    Tested-by: build bot (Jenkins)
    Reviewed-by: Patrick Georgi

See http://review.coreboot.org/10590 for details.

-gerrit