m-labs · Jul 26, 2015 · Jul 26, 2015 · Jul 26, 2015
diff --git a/.gitmodules b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "extcores/litepcie_phy_wrappers"]
 	path = extcores/litepcie_phy_wrappers
 	url = https://github.com/enjoy-digital/litepcie_phy_wrappers
+[submodule "software/unwinder"]
+	path = software/unwinder
+	url = https://github.com/whitequark/libunwind
diff --git a/software/include/base/pthread.h b/software/include/base/pthread.h
@@ -0,0 +1,27 @@
+#ifndef __PTHREAD_H
+#define __PTHREAD_H
+
+typedef int pthread_rwlock_t;
+
+#define PTHREAD_RWLOCK_INITIALIZER 0
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+inline int pthread_rwlock_rdlock(pthread_rwlock_t *rwlock)
+  { return 0; }
+inline int pthread_rwlock_tryrdlock(pthread_rwlock_t *rwlock)
+  { return 0; }
+inline int pthread_rwlock_wrlock(pthread_rwlock_t *rwlock)
+  { return 0; }
+inline int pthread_rwlock_trywrlock(pthread_rwlock_t *rwlock)
+  { return 0; }
+int pthread_rwlock_unlock(pthread_rwlock_t *rwlock)
+  { return 0; }
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __PTHREAD_H */
diff --git a/software/libbase/Makefile b/software/libbase/Makefile
@@ -1,7 +1,7 @@
 MSCDIR=../..
 include $(MSCDIR)/software/common.mak
 
-OBJECTS=exception.o libc.o errno.o crc16.o crc32.o console.o system.o id.o uart.o time.o qsort.o strtod.o spiflash.o
+OBJECTS=exception.o libc.o errno.o crc16.o crc32.o console.o environ.o system.o id.o uart.o time.o qsort.o strtod.o spiflash.o
 
 all: crt0-$(CPU).o libbase.a libbase-nofloat.a
 

diff --git a/software/libbase/environ.c b/software/libbase/environ.c
@@ -0,0 +1,11 @@
+#include <stdlib.h>
+#include <string.h>
+
+char *getenv(const char *varname) {
+  if(!strcmp(varname, "LIBUNWIND_PRINT_APIS") ||
+     !strcmp(varname, "LIBUNWIND_PRINT_UNWINDING")) {
+    return "1";
+  } else {
+    return NULL;
+  }
+}
diff --git a/software/libunwind/Makefile b/software/libunwind/Makefile
@@ -0,0 +1,30 @@
+MSCDIR=../..
+include $(MSCDIR)/software/common.mak
+
+COMMONFLAGS+=-integrated-as \
+	-I. -I$(MSCDIR)/software/include/dyld/ -I$(MSCDIR)/software/unwinder/include/ \
+	-D__ELF__ -D__linux__
+
+OBJECTS=UnwindRegistersSave.o UnwindRegistersRestore.o UnwindLevel1.o libunwind.o
+
+all: libunwind.a
+
+# pull in dependency info for *existing* .o files
+-include $(OBJECTS:.o=.d)
+
+libunwind.a: $(OBJECTS)
+	$(AR) crs libunwind.a $(OBJECTS)
+
+%.o: $(MSCDIR)/software/unwinder/src/%.cpp
+	$(compilexx-dep)
+
+%.o: $(MSCDIR)/software/unwinder/src/%.c
+	$(compile-dep)
+
+%.o: $(MSCDIR)/software/unwinder/src/%.S
+	$(assemble)
+
+.PHONY: clean
+
+clean:
+	$(RM) $(OBJECTS) $(OBJECTS:.o=.ts) $(OBJECTS:.o=.d) libuwind.a .*~ *~
diff --git a/software/libunwind/__cxxabi_config.h b/software/libunwind/__cxxabi_config.h
diff --git a/software/libunwind/strings.h b/software/libunwind/strings.h
@@ -0,0 +1,2 @@
+// This is some obsolete BSD crap that libunwind pulls in
+// that's so old and useless it's not worth putting into libbase.
diff --git a/software/unwinder b/software/unwinder
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// This is some obsolete BSD crap that libunwind pulls in
		// that's so old and useless it's not worth putting into libbase.