diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index deec62d95e..480763c36b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-10  Joel Brobecker  <brobecker@adacore.com>
+
+	* ada-lang.c (ada_evaluate_subexp) [OP_ATR_SIZE]: Use
+	archecture-neutral builtin_type_int32 instead of builtin_type_int.
+
 2008-09-10  Joel Brobecker  <brobecker@adacore.com>
 
 	* ada-lang.c (ada_evaluate_subexp) [BINOP_ADD, BINOP_SUB]:
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index fa163c4b54..05ea4666f1 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -9074,9 +9074,9 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp,
       if (noside == EVAL_SKIP)
         goto nosideret;
       else if (noside == EVAL_AVOID_SIDE_EFFECTS)
-        return value_zero (builtin_type_int, not_lval);
+        return value_zero (builtin_type_int32, not_lval);
       else
-        return value_from_longest (builtin_type_int,
+        return value_from_longest (builtin_type_int32,
                                    TARGET_CHAR_BIT
                                    * TYPE_LENGTH (value_type (arg1)));