am 3dc67987: Merge "x86: compile C files based on TARGET_ARCH"

* commit '3dc679876c6e43db3232fb9436d79b4bc90bbed4':
  x86: compile C files based on TARGET_ARCH