int offset, CORE_ADDR address,
                          struct ui_file *stream, int recurse,
                          struct value *original_value,
-                         const struct value_print_options *options,
-                         const struct language_defn *language)
+                         const struct value_print_options *options)
 {
   struct value *mark = value_mark ();
   struct value *val;
   else
     val_print (value_type (val),
               value_embedded_offset (val), value_address (val),
-              stream, recurse, val, options, language);
+              stream, recurse, val, options,
+              language_def (language_ada));
   value_free_to_mark (mark);
 }
 
                   int offset, int offset_aligned, CORE_ADDR address,
                   struct ui_file *stream, int recurse,
                   struct value *original_value,
-                  const struct value_print_options *options,
-                  const struct language_defn *language)
+                  const struct value_print_options *options)
 {
   val_print (type, offset, address, stream, recurse,
             original_value, options, language_def (language_c));
                   int offset, int offset_aligned, CORE_ADDR address,
                   struct ui_file *stream, int recurse,
                   struct value *original_value,
-                  const struct value_print_options *options,
-                  const struct language_defn *language)
+                  const struct value_print_options *options)
 {
   if (ada_is_fixed_point_type (type))
     {
 
          val_print (target_type,
                     value_embedded_offset (v), 0, stream,
-                    recurse + 1, v, options, language);
+                    recurse + 1, v, options,
+                    language_def (language_ada));
        }
       else
        val_print (TYPE_TARGET_TYPE (type), offset,
                   address, stream, recurse, original_value,
-                  options, language);
+                  options, language_def (language_ada));
       return;
     }
   else
                    int offset, int offset_aligned, CORE_ADDR address,
                    struct ui_file *stream, int recurse,
                    struct value *original_value,
-                   const struct value_print_options *options,
-                   const struct language_defn *language)
+                   const struct value_print_options *options)
 {
   int i;
   unsigned int len;
                   int offset, int offset_aligned, CORE_ADDR address,
                   struct ui_file *stream, int recurse,
                   struct value *original_value,
-                  const struct value_print_options *options,
-                  const struct language_defn *language)
+                  const struct value_print_options *options)
 {
   if (options->format)
     {
   (struct type *type, const gdb_byte *valaddr, int offset,
    int offset_aligned, CORE_ADDR address, struct ui_file *stream,
    int recurse, struct value *original_value,
-   const struct value_print_options *options,
-   const struct language_defn *language)
+   const struct value_print_options *options)
 {
   if (ada_is_bogus_array_descriptor (type))
     {
 
   if (print_field_values (type, valaddr, offset_aligned,
                          stream, recurse, original_value, options,
-                         0, type, offset_aligned, language) != 0
+                         0, type, offset_aligned,
+                         language_def (language_ada)) != 0
       && options->prettyformat)
     {
       fprintf_filtered (stream, "\n");
                   int offset, int offset_aligned, CORE_ADDR address,
                   struct ui_file *stream, int recurse,
                   struct value *original_value,
-                  const struct value_print_options *options,
-                  const struct language_defn *language)
+                  const struct value_print_options *options)
 {
   /* For references, the debugger is expected to print the value as
      an address if DEREF_REF is null.  But printing an address in place
        deref_val = ada_tag_value_at_base_address (deref_val);
 
       common_val_print (deref_val, stream, recurse + 1, options,
-                       language);
+                       language_def (language_ada));
       return;
     }
 
   val_print (value_type (deref_val),
             value_embedded_offset (deref_val),
             value_address (deref_val), stream, recurse + 1,
-            deref_val, options, language);
+            deref_val, options, language_def (language_ada));
 }
 
 /* See the comment on ada_val_print.  This function differs in that it
                 int offset, CORE_ADDR address,
                 struct ui_file *stream, int recurse,
                 struct value *original_value,
-                const struct value_print_options *options,
-                const struct language_defn *language)
+                const struct value_print_options *options)
 {
   int offset_aligned;
   const gdb_byte *valaddr = value_contents_for_printing (original_value);
     {
       ada_val_print_gnat_array (type, valaddr, offset, address,
                                stream, recurse, original_value,
-                               options, language);
+                               options);
       return;
     }
 
     case TYPE_CODE_PTR:
       ada_val_print_ptr (type, valaddr, offset, offset_aligned,
                         address, stream, recurse, original_value,
-                        options, language);
+                        options);
       break;
 
     case TYPE_CODE_INT:
     case TYPE_CODE_RANGE:
       ada_val_print_num (type, valaddr, offset, offset_aligned,
                         address, stream, recurse, original_value,
-                        options, language);
+                        options);
       break;
 
     case TYPE_CODE_ENUM:
       ada_val_print_enum (type, valaddr, offset, offset_aligned,
                          address, stream, recurse, original_value,
-                         options, language);
+                         options);
       break;
 
     case TYPE_CODE_FLT:
       ada_val_print_flt (type, valaddr, offset, offset_aligned,
                         address, stream, recurse, original_value,
-                        options, language);
+                        options);
       break;
 
     case TYPE_CODE_UNION:
     case TYPE_CODE_STRUCT:
       ada_val_print_struct_union (type, valaddr, offset, offset_aligned,
                                  address, stream, recurse,
-                                 original_value, options, language);
+                                 original_value, options);
       break;
 
     case TYPE_CODE_ARRAY:
     case TYPE_CODE_REF:
       ada_val_print_ref (type, valaddr, offset, offset_aligned,
                         address, stream, recurse, original_value,
-                        options, language);
+                        options);
       break;
     }
 }
   try
     {
       ada_val_print_1 (type, embedded_offset, address,
-                      stream, recurse, val, options,
-                      current_language);
+                      stream, recurse, val, options);
     }
   catch (const gdb_exception_error &except)
     {
 
--- /dev/null
+# Copyright 2018-2019 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+load_lib "ada.exp"
+
+standard_ada_testfile bla
+set cfile "foo"
+set csrcfile ${srcdir}/${subdir}/${testdir}/${cfile}.c
+set cobject [standard_output_file ${cfile}.o]
+
+gdb_compile "${csrcfile}" "${cobject}" object [list debug]
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-largs additional_flags=${cobject} additional_flags=-margs]] != "" } {
+  return -1
+}
+
+clean_restart ${testfile}
+
+set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.c]
+runto "foo.c:$bp_location"
+
+gdb_test_no_output "set print frame-arguments all"
+
+# Here is the scenario:
+#  - Once stopped in a C function, with language_mode set to auto, print
+#    backtrace, we should see the Ada frame arguments printed using Ada
+#    syntax.
+#  - Set language to C, then check that printing backtrace shows the Ada
+#    frame arguments using C syntax.
+#  - Set language back to auto, check language mode value, then print
+#    backtrace, we should see Ada frame arguments printed using Ada C
+#    syntax.
+
+gdb_test "show lang" \
+         "The current source language is \"auto; currently c\"." \
+         "show language when set to 'auto; c'"
+
+gdb_test "bt" \
+         "#1  $hex in pck\\.call_me \\(s=\"test\"\\).*" \
+         "backtrace with auto: c"
+
+gdb_test_no_output "set language c" \
+                   "Set current source language to \"manual; currently c\"."
+
+gdb_test "show lang" \
+         "The current source language is \"c\"." \
+         "show language when set to 'c'"
+
+gdb_test "bt" \
+         "#1  $hex in pck\\.call_me \\(s={P_ARRAY = $hex, P_BOUNDS = $hex}\\).*" \
+         "backtrace with language forced to 'c'"
+
+gdb_test_no_output "set language auto" \
+                   "Set current source language to \"auto; currently c\"."
+
+gdb_test "show lang" \
+         "The current source language is \"auto; currently c\"." \
+         "show language when set back to 'auto; c'"
+
+gdb_test "bt" \
+         "#1  $hex in pck\\.call_me \\(s=\"test\"\\).*" \
+         "backtrace with language back to 'auto; c'"