diff --git a/litex/soc/software/libc/Makefile b/litex/soc/software/libc/Makefile
index a9f83520a..a68016f8e 100644
--- a/litex/soc/software/libc/Makefile
+++ b/litex/soc/software/libc/Makefile
@@ -43,10 +43,8 @@ export CROSSFILE
 cross.txt:
 	@echo "$$CROSSFILE" > $@
 
-$(PICOLIBC_DIRECTORY)/newlib/libc/machine/$(CPUFAMILY)/meson.build:
-	cp $(LIBC_DIRECTORY)/$(CPUFAMILY)-meson.build $@
-
-libc.a: cross.txt $(PICOLIBC_DIRECTORY)/newlib/libc/machine/$(CPUFAMILY)/meson.build
+libc.a: cross.txt
+	cp $(LIBC_DIRECTORY)/$(CPUFAMILY)/* $(PICOLIBC_DIRECTORY)/newlib/libc/machine/$(CPUFAMILY)/
 	meson $(PICOLIBC_DIRECTORY) \
 		-Dmultilib=false \
 		-Dpicocrt=false \
diff --git a/litex/soc/software/libc/lm32-meson.build b/litex/soc/software/libc/lm32/meson.build
similarity index 100%
rename from litex/soc/software/libc/lm32-meson.build
rename to litex/soc/software/libc/lm32/meson.build
diff --git a/litex/soc/software/libc/or1k-meson.build b/litex/soc/software/libc/or1k/meson.build
similarity index 99%
rename from litex/soc/software/libc/or1k-meson.build
rename to litex/soc/software/libc/or1k/meson.build
index 09804d424..9cd7e39ff 100644
--- a/litex/soc/software/libc/or1k-meson.build
+++ b/litex/soc/software/libc/or1k/meson.build
@@ -34,6 +34,7 @@
 #
 srcs_machine = [
   'setjmp.S',
+  'exception.c',
 ]
 
 foreach target : targets