diff --git a/src/mesa/tnl/t_vtx_api.c b/src/mesa/tnl/t_vtx_api.c
index 9f67c6cee73..926b277dc97 100644
--- a/src/mesa/tnl/t_vtx_api.c
+++ b/src/mesa/tnl/t_vtx_api.c
@@ -404,9 +404,11 @@ static attrfv_func do_choose( GLuint attr, GLuint sz )
 
    /* Try to use codegen:
     */   
+#ifdef USE_X86_ASM
    if (tnl->AllowCodegen)
       tnl->vtx.tabfv[attr][sz-1] = do_codegen( ctx, attr, sz );
    else
+#endif
       tnl->vtx.tabfv[attr][sz-1] = 0;
 
    /* Else use generic version:
@@ -883,9 +885,11 @@ void _tnl_vtx_init( GLcontext *ctx )
       choose[ERROR_ATTRIB][2] = error_attrib;
       choose[ERROR_ATTRIB][3] = error_attrib;
 
+#ifdef USE_X86_ASM
       if (tnl->AllowCodegen) {
          _tnl_x86choosers(choose, do_choose); /* x86 INIT_CHOOSERS */
       }
+#endif
 
       _tnl_generic_attr_table_init( generic_attr_func );
    }
@@ -905,9 +909,11 @@ void _tnl_vtx_init( GLcontext *ctx )
    _tnl_current_init( ctx );
    _tnl_exec_vtxfmt_init( ctx );
    _tnl_generic_exec_vtxfmt_init( ctx );
+#ifdef USE_X86_ASM
    if (tnl->AllowCodegen) {
       _tnl_x86_exec_vtxfmt_init( ctx ); /* x86 DISPATCH_ATTRFV */
    }
+#endif
 
    _mesa_install_exec_vtxfmt( ctx, &tnl->exec_vtxfmt );