diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index fdb85f290b7..673d266a6a7 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-23  Pascal Obry  <obry@adacore.com>
+
+	* impunit.adb: Add g-exptty and g-tty units.
+
+2011-11-23  Robert Dewar  <dewar@adacore.com>
+
+	* exp_imgv.adb: Minor code reorganization (use Make_Temporary).
+
 2011-11-23  Robert Dewar  <dewar@adacore.com>
 
 	* exp_util.adb, par-ch6.adb, sem_res.adb, par-util.adb: Minor
@@ -7,6 +15,7 @@
 
 	* sem_ch13.adb (Analyze_Aspect_Specifications): Place error on
 	line of precondition/ postcondition/invariant.
+
 2011-11-23  Pascal Obry  <obry@adacore.com>
 
 	* g-exptty.ads, g-exptty.adb, g-tty.ads, g-tty.adb,
diff --git a/gcc/ada/exp_imgv.adb b/gcc/ada/exp_imgv.adb
index 14443b0ef88..b819a36ebc2 100644
--- a/gcc/ada/exp_imgv.adb
+++ b/gcc/ada/exp_imgv.adb
@@ -1191,10 +1191,7 @@ package body Exp_Imgv is
 
          if Discard_Names (Rtyp) then
             declare
-               Tnn : constant Entity_Id :=
-                       Make_Defining_Identifier (Loc,
-                         Chars => New_Internal_Name ('T'));
-
+               Tnn   : constant Entity_Id := Make_Temporary (Loc, 'T');
                Cexpr : Node_Id;
                P     : Int;
                M     : Int;
diff --git a/gcc/ada/impunit.adb b/gcc/ada/impunit.adb
index 63ab9256953..496f6ce50d4 100644
--- a/gcc/ada/impunit.adb
+++ b/gcc/ada/impunit.adb
@@ -270,6 +270,7 @@ package body Impunit is
     ("g-except", F),  -- GNAT.Exceptions
     ("g-exctra", F),  -- GNAT.Exception_Traces
     ("g-expect", F),  -- GNAT.Expect
+    ("g-exptty", F),  -- GNAT.Expect.TTY
     ("g-flocon", F),  -- GNAT.Float_Control
     ("g-heasor", F),  -- GNAT.Heap_Sort
     ("g-hesora", F),  -- GNAT.Heap_Sort_A
@@ -318,6 +319,7 @@ package body Impunit is
     ("g-timsta", F),  -- GNAT.Time_Stamp
     ("g-traceb", F),  -- GNAT.Traceback
     ("g-trasym", F),  -- GNAT.Traceback.Symbolic
+    ("g-tty   ", F),  -- GNAT.TTY
     ("g-utf_32", F),  -- GNAT.UTF_32
     ("g-u3spch", F),  -- GNAT.UTF_32_Spelling_Checker
     ("g-wispch", F),  -- GNAT.Wide_Spelling_Checker