From 57c2fa9d11f45618e25798eb2065c1b14b847264 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 11 Mar 2011 18:17:57 -0800
Subject: [PATCH] Rename libsupport to librustllvm

---
 src/Makefile                                     | 16 ++++++++--------
 src/{support => llvmext}/Object.cpp              |  0
 src/{support => llvmext}/README                  |  0
 src/{support => llvmext}/include/llvm-c/Object.h |  0
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename src/{support => llvmext}/Object.cpp (100%)
 rename src/{support => llvmext}/README (100%)
 rename src/{support => llvmext}/include/llvm-c/Object.h (100%)

diff --git a/src/Makefile b/src/Makefile
index dc6a78a52d4..47365a7c9b4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -34,7 +34,7 @@ DSYMUTIL := true
 
 ifeq ($(CFG_OSTYPE), FreeBSD)
   CFG_RUNTIME := librustrt.so
-  CFG_SUPPORT := librustsupport.so
+  CFG_SUPPORT := librustllvm.so
   CFG_STDLIB := libstd.so
   CFG_GCC_CFLAGS += -fPIC -march=i686 -I/usr/local/include
   CFG_GCC_LINK_FLAGS += -shared -fPIC -lpthread -lrt
@@ -48,7 +48,7 @@ endif
 
 ifeq ($(CFG_OSTYPE), Linux)
   CFG_RUNTIME := librustrt.so
-  CFG_SUPPORT := librustsupport.so
+  CFG_SUPPORT := librustllvm.so
   CFG_STDLIB := libstd.so
   CFG_GCC_CFLAGS += -fPIC -march=i686
   CFG_GCC_LINK_FLAGS += -shared -fPIC -ldl -lpthread -lrt
@@ -62,7 +62,7 @@ endif
 
 ifeq ($(CFG_OSTYPE), Darwin)
   CFG_RUNTIME := librustrt.dylib
-  CFG_SUPPORT := librustsupport.dylib
+  CFG_SUPPORT := librustllvm.dylib
   CFG_STDLIB := libstd.dylib
   CFG_UNIXY := 1
   CFG_GCC_LINK_FLAGS += -dynamiclib -lpthread
@@ -88,7 +88,7 @@ ifdef CFG_WINDOWSY
     CFG_NATIVE := 1
   endif
   CFG_RUNTIME := rustrt.dll
-  CFG_SUPPORT := rustsupport.dll
+  CFG_SUPPORT := rustllvm.dll
   CFG_STDLIB := std.dll
   CFG_EXE_SUFFIX := .exe
   CFG_BOOT := ./rustboot.exe
@@ -111,7 +111,7 @@ ifdef CFG_UNIXY
     CFG_GCC_CROSS := i586-mingw32msvc-
     CFG_BOOT_FLAGS += -t win32-x86-pe
     CFG_RUNTIME := rustrt.dll
-    CFG_SUPPORT := rustsupport.dll
+    CFG_SUPPORT := rustllvm.dll
     CFG_STDLIB := std.dll
     CFG_RUSTC := ./rustc.exe
     ifdef CFG_VALGRIND
@@ -310,9 +310,9 @@ RUNTIME_HDR := rt/globals.h \
 RUNTIME_INCS := -Irt/isaac -Irt/uthash
 RUNTIME_OBJS := $(RUNTIME_CS:.cpp=.o)
 
-SUPPORT_CS := support/Object.cpp
+SUPPORT_CS := llvmext/Object.cpp
 
-SUPPORT_HDR := support/include/llvm-c/Object.h
+SUPPORT_HDR := llvmext/include/llvm-c/Object.h
 
 SUPPORT_INCS := -iquote $(CFG_LLVM_INCDIR)
 SUPPORT_OBJS := $(SUPPORT_CS:.cpp=.o)
@@ -351,7 +351,7 @@ rt/%.o: rt/%.cpp $(MKFILES)
 	@$(call CFG_ECHO, compile: $<)
 	$(CFG_QUIET)$(call CFG_COMPILE_C, $@, $(RUNTIME_INCS)) $<
 
-support/%.o: support/%.cpp $(MKFILES)
+llvmext/%.o: llvmext/%.cpp $(MKFILES)
 	@$(call CFG_ECHO, compile: $<)
 	$(CFG_QUIET)$(call CFG_COMPILE_C, $@, $(CFG_LLVM_CXXFLAGS) \
 		$(SUPPORT_INCS)) $<
diff --git a/src/support/Object.cpp b/src/llvmext/Object.cpp
similarity index 100%
rename from src/support/Object.cpp
rename to src/llvmext/Object.cpp
diff --git a/src/support/README b/src/llvmext/README
similarity index 100%
rename from src/support/README
rename to src/llvmext/README
diff --git a/src/support/include/llvm-c/Object.h b/src/llvmext/include/llvm-c/Object.h
similarity index 100%
rename from src/support/include/llvm-c/Object.h
rename to src/llvmext/include/llvm-c/Object.h