Merge mainline into cleanbuild

diff --cc conf/any-emu.rmk
index c06e7758a69fdb628fe3f99d6f1bb51753d81dde,2ded20e2ef7ac29cd3be2fb47e18dc3cd790545b..95f44844c66602a06153757eae2c1a972d284fae
--- 1/conf/any-emu.rmk
--- 2/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@@ -1,7 -1,11 +1,8 @@@
  # -*- makefile -*-
  
+ COMMON_LDFLAGS += -nostdlib
  COMMON_CFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include) -fno-builtin
  
 -# Used by various components.  These rules need to precede them.
 -script/lexer.c_DEPENDENCIES = grub_script.tab.h
 -
  util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
  kernel_img_RELOCATABLE = yes
  pkglib_PROGRAMS = kernel.img

diff --cc configure.ac
Simple merge