From f72e172ac322204570209b68fd2385ac955734e4 Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Tue, 10 Nov 2015 12:11:06 +0100
Subject: [PATCH] soc/software: remove libunwind

---
 .gitmodules                                   |  3 --
 litex/soc/integration/builder.py              |  1 -
 litex/soc/software/libunwind/Makefile         | 35 -------------------
 .../soc/software/libunwind/__cxxabi_config.h  |  1 -
 litex/soc/software/unwinder                   |  1 -
 5 files changed, 41 deletions(-)
 delete mode 100644 litex/soc/software/libunwind/Makefile
 delete mode 100644 litex/soc/software/libunwind/__cxxabi_config.h
 delete mode 160000 litex/soc/software/unwinder

diff --git a/.gitmodules b/.gitmodules
index 0aff80a12..4c401e1a9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,3 @@
 [submodule "litex/soc/software/compiler_rt"]
 	path = litex/soc/software/compiler_rt
 	url = http://llvm.org/git/compiler-rt.git
-[submodule "litex/soc/software/unwinder"]
-	path = litex/soc/software/unwinder
-	url = https://github.com/whitequark/libunwind
diff --git a/litex/soc/integration/builder.py b/litex/soc/integration/builder.py
index 9aca14b3a..6d51cf35f 100644
--- a/litex/soc/integration/builder.py
+++ b/litex/soc/integration/builder.py
@@ -15,7 +15,6 @@ soc_software_packages = [
     "libcompiler_rt",
     "libdyld",
     "libnet",
-    "libunwind",
     "bios"
 ]
 
diff --git a/litex/soc/software/libunwind/Makefile b/litex/soc/software/libunwind/Makefile
deleted file mode 100644
index a1248387e..000000000
--- a/litex/soc/software/libunwind/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-include ../include/generated/variables.mak
-include $(SOC_DIRECTORY)/software/common.mak
-
-# lm32 is not supported
-ifeq ($(CPU),lm32)
-	ALL_TARGET=
-else
-	ALL_TARGET=libunwind.a
-endif
-
-COMMONFLAGS+=-integrated-as \
-	-I. -I$(SOC_DIRECTORY)/software/include/dyld/ -I$(SOC_DIRECTORY)/software/unwinder/include/ \
-	-I$(LIBUNWIND_DIRECTORY) \
-	-D__ELF__ -D__linux__ -D_LIBUNWIND_NO_HEAP -DNDEBUG
-
-OBJECTS=UnwindRegistersSave.o UnwindRegistersRestore.o UnwindLevel1.o libunwind.o
-
-all: $(ALL_TARGET)
-
-libunwind.a: $(OBJECTS)
-	$(AR) crs libunwind.a $(OBJECTS)
-
-%.o: $(SOC_DIRECTORY)/software/unwinder/src/%.cpp
-	$(compilexx)
-
-%.o: $(SOC_DIRECTORY)/software/unwinder/src/%.c
-	$(compile)
-
-%.o: $(SOC_DIRECTORY)/software/unwinder/src/%.S
-	$(assemble)
-
-.PHONY: clean
-
-clean:
-	$(RM) $(OBJECTS) libunwind.a .*~ *~
diff --git a/litex/soc/software/libunwind/__cxxabi_config.h b/litex/soc/software/libunwind/__cxxabi_config.h
deleted file mode 100644
index 42cd6fe5c..000000000
--- a/litex/soc/software/libunwind/__cxxabi_config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define LIBCXXABI_ARM_EHABI 0
diff --git a/litex/soc/software/unwinder b/litex/soc/software/unwinder
deleted file mode 160000
index 8b1196692..000000000
--- a/litex/soc/software/unwinder
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8b1196692d823a090a9879a695050baa7acc39ee