Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -242,10 +242,32 @@
 	AC_DEFINE(OF_NINTENDO_3DS, 1,
 		[Whether we are compiling for Nintendo 3DS])
 	OBJFW_CPPFLAGS="$OBJFW_CPPFLAGS -DARM11 -I\$DEVKITPRO/libctru/include"
 	AC_SUBST(MAP_LDFLAGS, ['-Wl,-Map,$@.map'])
 ])
+
+AC_ARG_WITH(nintendo-switch,
+	AS_HELP_STRING([--with-nintendo-switch], [build for Nintendo Switch]))
+AS_IF([test x"$with_nintendo_switch" = x"yes"], [
+	AS_IF([test x"$DEVKITPRO" = x""], [
+		AC_MSG_ERROR([DEVKITPRO is not set! Please set DEVKITPRO.])
+	])
+
+	flags="-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE"
+	OBJCFLAGS="$OBJCFLAGS $flags"
+	OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS $flags"
+	CPPFLAGS="$CPPFLAGS -D__SWITCH__ -I$DEVKITPRO/libnx/include"
+	ASFLAGS="$ASFLAGS $flags"
+	LDFLAGS="$LDFLAGS -specs=$DEVKITPRO/libnx/switch.specs $flags"
+	LIBS="$LIBS -L$DEVKITPRO/libnx/lib -lnx"
+	enable_shared="no"
+	enable_threads="no"	# TODO
+	enable_sockets="no"	# TODO
+
+	AC_DEFINE(OF_NINTENDO_SWITCH, 1,
+		[Whether we are compiling for Nintendo Switch])
+])
 
 CPP="$OBJCPP"
 CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS -DOF_COMPILING_OBJFW"
 flags="-fexceptions -fobjc-exceptions -funwind-tables"
 flags="$flags -fconstant-string-class=OFConstantString"

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -5,11 +5,12 @@
 	  terminal
 
 CLEAN = EBOOT.PBP		\
 	boot.dol		\
 	${PROG_NOINST}.arm9	\
-	${PROG_NOINST}.nds
+	${PROG_NOINST}.nds	\
+	${PROG_NOINST}.nro
 DISTCLEAN = Info.plist
 
 PROG_NOINST = tests${PROG_SUFFIX}
 STATIC_LIB_NOINST = ${TESTS_STATIC_LIB}
 SRCS = ForwardingTests.m		\
@@ -192,10 +193,13 @@
 
 boot.dol: ${PROG_NOINST}
 	elf2dol ${PROG_NOINST} $@
 
 ${PROG_NOINST}: ${LIBOBJFW_DEP} ${LIBOBJFWRT_DEP}
+
+${PROG_NOINST}.3dsx: ${PROG_NOINST}
+	3dsxtool $< $@
 
 ${PROG_NOINST}.arm9: ${PROG_NOINST}
 	arm-none-eabi-objcopy -O binary $< $@
 
 ${PROG_NOINST}.nds: ${PROG_NOINST}.arm9
@@ -203,13 +207,13 @@
 	mkdir -p nds-data
 	cp testfile.bin testfile.txt testfile.ini serialization.xml nds-data
 	ndstool -c $@ -9 $< -d nds-data
 	rm -fr nds-data
 
-${PROG_NOINST}.3dsx: ${PROG_NOINST}
-	3dsxtool $< $@
+${PROG_NOINST}.nro: ${PROG_NOINST}
+	elf2nro $< $@
 
 CPPFLAGS += -I../src -I../src/exceptions -I../src/runtime -I.. -DSTDOUT
 OBJCFLAGS_RuntimeARCTests.m = -fobjc-arc -fobjc-arc-exceptions
 LIBS := ${TESTS_LIBS} ${LIBS}
 LDFLAGS += ${MAP_LDFLAGS}
 LD = ${OBJC}