diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0459ce106a..a044a5c670 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-15  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms (OBJS): Compile te-vms.c only on Itanium.
+
 2009-09-14  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR gas/10637
diff --git a/gas/makefile.vms b/gas/makefile.vms
index 1cf4407a00..e4ba506a1f 100644
--- a/gas/makefile.vms
+++ b/gas/makefile.vms
@@ -20,13 +20,17 @@ CFLAGS=/names=(as_is,shortened)\
 #LFLAGS=/debug/map=as.map
 endif
 
-OBJS=targ-cpu.obj,obj-format.obj,atof-targ.obj,app.obj,as.obj,atof-generic.obj,\
-  te-vms.obj,cond.obj,depend.obj,expr.obj,flonum-konst.obj,\
+OBJS:=targ-cpu.obj,obj-format.obj,atof-targ.obj,app.obj,as.obj,\
+  atof-generic.obj,cond.obj,depend.obj,expr.obj,flonum-konst.obj,\
   flonum-copy.obj,flonum-mult.obj,frags.obj,hash.obj,input-file.obj,\
   input-scrub.obj,literal.obj,messages.obj,output-file.obj,read.obj,\
   subsegs.obj,symbols.obj,write.obj,listing.obj,ecoff.obj,stabs.obj,sb.obj,\
   macro.obj,ehopt.obj,dw2gencfi.obj,dwarf2dbg.obj,remap.obj
 
+ifeq ($(ARCH),IA64)
+OBJS:=$(OBJS),te-vms.obj
+endif
+
 LIBIBERTY = [-.libiberty]libiberty.olb
 LIBBFD = [-.bfd]libbfd.olb
 LIBOPCODES = [-.opcodes]libopcodes.olb