diff --git a/arch/common/CMakeLists.txt b/arch/common/CMakeLists.txt
index e1353c1eaa..1a89ba9c13 100644
--- a/arch/common/CMakeLists.txt
+++ b/arch/common/CMakeLists.txt
@@ -7,10 +7,15 @@ zephyr_library_include_directories(include)
 # Library may be empty due to kconfigs
 zephyr_library_property(ALLOW_EMPTY TRUE)
 
-zephyr_library_sources_ifdef(
-  CONFIG_GEN_ISR_TABLES
-  sw_isr_common.c
+if(CONFIG_GEN_ISR_TABLES)
+  zephyr_library_sources(
+    sw_isr_common.c
   )
+  zephyr_library_sources_ifdef(
+    CONFIG_DYNAMIC_INTERRUPTS
+    dynamic_isr.c
+  )
+endif()
 
 zephyr_library_sources_ifdef(
   CONFIG_MULTI_LEVEL_INTERRUPTS
diff --git a/arch/common/dynamic_isr.c b/arch/common/dynamic_isr.c
new file mode 100644
index 0000000000..9f56977f25
--- /dev/null
+++ b/arch/common/dynamic_isr.c
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2018 Intel Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "sw_isr_common.h"
+#include <zephyr/sw_isr_table.h>
+#include <zephyr/irq.h>
+#include <zephyr/sys/__assert.h>
+
+void __weak z_isr_install(unsigned int irq, void (*routine)(const void *),
+			  const void *param)
+{
+	unsigned int table_idx;
+
+	/*
+	 * Do not assert on the IRQ enable status for ARM GIC since the SGI
+	 * type interrupts are always enabled and attempting to install an ISR
+	 * for them will cause the assertion to fail.
+	 */
+#ifndef CONFIG_GIC
+	__ASSERT(!irq_is_enabled(irq), "IRQ %d is enabled", irq);
+#endif /* !CONFIG_GIC */
+
+	table_idx = z_get_sw_isr_table_idx(irq);
+
+	/* If dynamic IRQs are enabled, then the _sw_isr_table is in RAM and
+	 * can be modified
+	 */
+	_sw_isr_table[table_idx].arg = param;
+	_sw_isr_table[table_idx].isr = routine;
+}
+
+/* Some architectures don't/can't interpret flags or priority and have
+ * no more processing to do than this.  Provide a generic fallback.
+ */
+int __weak arch_irq_connect_dynamic(unsigned int irq,
+				    unsigned int priority,
+				    void (*routine)(const void *),
+				    const void *parameter,
+				    uint32_t flags)
+{
+	ARG_UNUSED(flags);
+	ARG_UNUSED(priority);
+
+	z_isr_install(irq, routine, parameter);
+	return irq;
+}
diff --git a/arch/common/sw_isr_common.c b/arch/common/sw_isr_common.c
index 9ed50e1084..5efdeb89a6 100644
--- a/arch/common/sw_isr_common.c
+++ b/arch/common/sw_isr_common.c
@@ -17,46 +17,3 @@ unsigned int __weak z_get_sw_isr_table_idx(unsigned int irq)
 {
 	return irq - CONFIG_GEN_IRQ_START_VECTOR;
 }
-
-#ifdef CONFIG_DYNAMIC_INTERRUPTS
-
-void __weak z_isr_install(unsigned int irq, void (*routine)(const void *),
-			  const void *param)
-{
-	unsigned int table_idx;
-
-	/*
-	 * Do not assert on the IRQ enable status for ARM GIC since the SGI
-	 * type interrupts are always enabled and attempting to install an ISR
-	 * for them will cause the assertion to fail.
-	 */
-#ifndef CONFIG_GIC
-	__ASSERT(!irq_is_enabled(irq), "IRQ %d is enabled", irq);
-#endif /* !CONFIG_GIC */
-
-	table_idx = z_get_sw_isr_table_idx(irq);
-
-	/* If dynamic IRQs are enabled, then the _sw_isr_table is in RAM and
-	 * can be modified
-	 */
-	_sw_isr_table[table_idx].arg = param;
-	_sw_isr_table[table_idx].isr = routine;
-}
-
-/* Some architectures don't/can't interpret flags or priority and have
- * no more processing to do than this.  Provide a generic fallback.
- */
-int __weak arch_irq_connect_dynamic(unsigned int irq,
-				    unsigned int priority,
-				    void (*routine)(const void *),
-				    const void *parameter,
-				    uint32_t flags)
-{
-	ARG_UNUSED(flags);
-	ARG_UNUSED(priority);
-
-	z_isr_install(irq, routine, parameter);
-	return irq;
-}
-
-#endif /* CONFIG_DYNAMIC_INTERRUPTS */