diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 39713edf01c..24b7c9ac4a5 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-12  Rasmus Villemoes  <rv@rasmusvillemoes.dk>
+
+	* config/rs6000/tramp.S (__trampoline_setup): Also emit .size
+	and .cfi_endproc directives for VxWorks targets.
+
 2018-12-05  Paul Koning  <ni1d@arrl.net>
 
 	* udivmodhi4.c (__udivmodhi4): Fix loop end check.
diff --git a/libgcc/config/rs6000/tramp.S b/libgcc/config/rs6000/tramp.S
index 637f4510146..a9f0f3826dc 100644
--- a/libgcc/config/rs6000/tramp.S
+++ b/libgcc/config/rs6000/tramp.S
@@ -114,11 +114,10 @@ FUNC_START(__trampoline_setup)
 	addi	r30,r30,_GLOBAL_OFFSET_TABLE_-1b@l
 #endif
 	bl	JUMP_TARGET(abort)
+#endif
 	.cfi_endproc
 FUNC_END(__trampoline_setup)
 
-#endif
-
 #elif _CALL_ELF == 2
 	.type	trampoline_initial,@object
 	.align	3