Index: src/benchmark/Makefile.am
===================================================================
--- src/benchmark/Makefile.am	(revision 2086ab212237ddf5573bec76feb3f3ddbb3273c0)
+++ src/benchmark/Makefile.am	(revision 2b716ec28ad95c2132e5e2ff74fd1bb6fb81fd9d)
@@ -94,5 +94,7 @@
 	ctxswitch-cfa_thread.run	\
 	ctxswitch-upp_coroutine.run	\
-	ctxswitch-upp_thread.run
+	ctxswitch-upp_thread.run	\
+	ctxswitch-goroutine.run		\
+	ctxswitch-java_thread.run
 
 ctxswitch-cfa_coroutine$(EXEEXT):
@@ -110,4 +112,13 @@
 ctxswitch-pthread$(EXEEXT):
 	@@BACKEND_CC@ ctxswitch/pthreads.c  -DBENCH_N=50000000  -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+
+ctxswitch-goroutine$(EXEEXT):
+	@go build -o a.out ctxswitch/goroutine.go
+
+ctxswitch-java_thread$(EXEEXT):
+	@javac ctxswitch/JavaThread.java
+	@echo "#!/bin/sh" > a.out
+	@echo "cd ctxswitch && java JavaThread" >> a.out
+	@chmod a+x a.out
 
 ## =========================================================================================================
@@ -183,5 +194,7 @@
 	creation-cfa_thread.run			\
 	creation-upp_coroutine.run		\
-	creation-upp_thread.run
+	creation-upp_thread.run			\
+	creation-goroutine.run			\
+	creation-java_thread.run
 
 creation-cfa_coroutine$(EXEEXT):
@@ -202,4 +215,13 @@
 creation-pthread$(EXEEXT):
 	@@BACKEND_CC@ creation/pthreads.c  -DBENCH_N=250000     -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+
+creation-goroutine$(EXEEXT):
+	@go build -o a.out creation/goroutine.go
+
+creation-java_thread$(EXEEXT):
+	@javac creation/JavaThread.java
+	@echo "#!/bin/sh" > a.out
+	@echo "cd creation && java JavaThread" >> a.out
+	@chmod a+x a.out
 
 ## =========================================================================================================