diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6c7c1d0e3b1..406b52b5cc4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-12  Olivier Hainque  <hainque@adacore.com>
+
+	* config/rs6000/t-vxworks: Remove assignment to LIB2FUNCS_EXTRA.
+
 2006-12-12  Olivier Hainque  <hainque@adacore.com>
 
 	* config/vxlib.c: Extract tls related routines into ...
diff --git a/gcc/config/rs6000/t-vxworks b/gcc/config/rs6000/t-vxworks
index fe65a399397..f042b772c2d 100644
--- a/gcc/config/rs6000/t-vxworks
+++ b/gcc/config/rs6000/t-vxworks
@@ -6,6 +6,11 @@ MULTILIB_DIRNAMES =
 MULTILIB_MATCHES = fPIC=fpic
 MULTILIB_EXCEPTIONS = fPIC*
 
-# Restore some variables from t-vxworks clobbered by t-ppccomm.
+# This is set from the common config/t-vxworks but clobbered by t-ppccomm
+# on this target.
 EXTRA_MULTILIB_PARTS = 
-LIB2FUNCS_EXTRA = $(srcdir)/config/vxlib.c
+
+# Similarily, LIB2FUNCS_EXTRA is set from config/t-vxworks and
+# t-ppccomm *adds* to it, but the common contents are useful to us.
+# In particular the base trampoline_setup bits are expected to be
+# provided there.