diff --git a/llvm/tools/gold/Makefile b/llvm/tools/gold/Makefile
index 65e99bf41c9a..7bac4ec62dea 100644
--- a/llvm/tools/gold/Makefile
+++ b/llvm/tools/gold/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../..
-LIBRARYNAME = LLVMgold
+LIBRARYNAME = libLLVMgold
 
 # Include this here so we can get the configuration of the targets
 # that have been configured for construction. We have to do this 
@@ -18,8 +18,9 @@ include $(LEVEL)/Makefile.config
 LINK_LIBS_IN_SHARED=1
 SHARED_LIBRARY = 1
 BUILD_ARCHIVE = 0
+LOADABLE_MODULE = 1
 
-LINK_COMPONENTS :=
+LINK_COMPONENTS := support system
 LIBS += -llto
 
 # Because off_t is used in the public API, the largefile parts are required for