[llvm-commits] CVS: llvm/Makefile.common Makefile.Linux

[Chris Lattner]

Changes in directory llvm:

Makefile.common updated: 1.67 -> 1.68
Makefile.Linux updated: 1.4 -> 1.5

---
Log message:

Generalize ExportSymbols into PLATFORMLINKOPTS


---
Diffs of the changes:

Index: llvm/Makefile.common
diff -u llvm/Makefile.common:1.67 llvm/Makefile.common:1.68
--- llvm/Makefile.common:1.67	Tue Oct 29 09:15:22 2002
+++ llvm/Makefile.common	Mon Nov  4 14:50:33 2002
@@ -393,6 +393,7 @@
 USED_LIB_PATHS_G := $(addprefix $(LIBDEBUG)/, $(STATICUSEDLIBS))
 USED_LIB_PATHS_O := $(addprefix $(LIBRELEASE)/, $(STATICUSEDLIBS))
 USED_LIB_PATHS_P := $(addprefix $(LIBPROFILE)/, $(STATICUSEDLIBS))
+LINK_OPTS        := $(TOOLLINKOPTS) $(PLATFORMLINKOPTS)
 
 all::   $(TOOLEXENAMES)
 clean::
@@ -400,15 +401,15 @@
 
 $(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(BUILD_ROOT_TOP)/tools/Debug/.dir
 	@echo ======= Linking $(TOOLNAME) debug executable $(WARN_MSG) =======
-	$(VERB) $(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS_G) $(TOOLLINKOPTS)
+	$(VERB) $(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS_G) $(LINK_OPTS)
 
 $(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(BUILD_ROOT_TOP)/tools/Release/.dir
 	@echo ======= Linking $(TOOLNAME) release executable =======
-	$(VERB) $(LinkO) -o $@ $(ObjectsO) $(USED_LIBS_OPTIONS_O) $(TOOLLINKOPTS)
+	$(VERB) $(LinkO) -o $@ $(ObjectsO) $(USED_LIBS_OPTIONS_O) $(LINK_OPTS)
 
 $(TOOLEXENAME_P): $(ObjectsP) $(USED_LIB_PATHS_P) $(BUILD_ROOT_TOP)/tools/Profile/.dir
 	@echo ======= Linking $(TOOLNAME) profile executable =======
-	$(VERB) $(LinkP) -o $@ $(ObjectsP) $(USED_LIBS_OPTIONS_P) $(TOOLLINKOPTS)
+	$(VERB) $(LinkP) -o $@ $(ObjectsP) $(USED_LIBS_OPTIONS_P) $(LINK_OPTS)
 
 endif
 


Index: llvm/Makefile.Linux
diff -u llvm/Makefile.Linux:1.4 llvm/Makefile.Linux:1.5
--- llvm/Makefile.Linux:1.4	Mon Sep 23 09:24:19 2002
+++ llvm/Makefile.Linux	Mon Nov  4 14:50:33 2002
@@ -10,10 +10,10 @@
 #
 MakeSharedObjectOption := -shared
 
-# ExportSymbols - This is used by tools that need to make sure that all of their
-# symbols are exported for use at runtime by dlsym.
+# PLATFORMLINKOPTS - On Linux, we must specify this linker option so that all
+# symbols are exported by tools for runtime use by dlsym.
 #
-ExportSymbols := -Wl,--export-dynamic
+PLATFORMLINKOPTS := -Wl,--export-dynamic
 
 # Path to location for LLVM front-end for this architecture.  This setting may
 # be overriden by the Makefile.config option, and should not override it if set.