merge from gcc

merge from gcc

*** empty log message ***

daily update

2005-04-12  Paul Gilliam  <pgilliam@us.ibm.com>

        * lib/gdb.exp (test_compiler_info): Give argument a default value.

2005-04-12  Paul Brook  <paul@codesourcery.com>

* opcode/m88k.h: Rename psr macros to avoid conflicts.

include/opcode/ChangeLog:
* i386.h (i386_optab): Mark VIA PadLock instructions as ImmExt and
adjust them accordingly.
gas/ChangeLog:
* config/tc-i386.c (output_insn): Handle VIA PadLock instructions
similar to other instructions now that they're marked as ImmExt.

merge from gcc

* hash.c (DEFAULT_SIZE): Delete.  Replace with:
  (gas_hash_table_size): New static variable.
  (set_gas_hash_table_size): New function:  Records a requested size for the hash tables.
  (get_gas_hash_table_size): New function: Return a prime number near the requested size of the hash table.
  (hash_new): Use get_gas_hash_table_size.
* hash.h: Add a prototype for set_gas_hash_table_size.
* as.c (show_usage): Add description of new switches: --hash-size and --reduce-memory-overheads.
  (option_values): Add OPTION_HASH_TABLE_SIZE and OPTION_REDUCE_MEMORY_OVERHEADS.
  (std_longpopts): Add entries for the new options.
  (parse_args): Handle the new options.
* Makefile.am: Add a dependency of as.c on hash.h.
* Makefile.in: Regenerate.
* doc/as.texinfo: Document the new switches.
* NEWS: Mention the new switches.

PR gas/818
* config/tc-hppa.c (pre_defined_registers): Fix %farg[0-3] synonyms.

bfd/
* Makefile.am: Run "make dep-am".
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* libcoff.h: Regenerate.
bfd/doc/
* Makefile.in: Regenerate.
binutils/
* Makefile.am: Run "make dep-am".
(syslex.o, sysinfo.o, arparse.o, arlex.o): Add -Wno-error to command.
(sysroff.o, defparse.o, deflex.o): Likewise.
(nlmheader.o, rcparse.o, rclex.o): Likewise.
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* config.in: Regenerate.
* configure: Regenerate.
gas/
* Makefile.am: Run "make dep-am".
* Makefile.in: Regenerate.
ld/
* Makefile.am: Run "make dep-am".
(ldgram.o, ldlex.o, deffilep.o): Add -Wno-error to command.
* Makefile.in: Regenerate.
* config.in: Regenerate.

*** empty log message ***

daily update

* config/tc-xtensa.c (check_t1_t2_reads_and_writes): Fix typo.

* gas/all/gas.exp: Don't run fastcall labels test on
i*86-*-openbsd*.

* configure.tgt (generic_target): Add support for OpenBSD/i386 ELF.

2005-04-11  H.J. Lu  <hongjiu.lu@intel.com>

* linker.c (_bfd_generic_link_output_symbols): Also check if
the output section of an input section has been removed from
the output file.

* section.c (bfd_section_list_remove): Clear the next field
of the removed section.
(bfd_section_removed_from_list): New.
* bfd-in2.h: Regenerated.

2005-04-11  David S. Miller  <davem@davemloft.net>

* elf32-sparc.c (elf32_sparc_relocate_section,
R_SPARC_TLS_LDO_{HIX22,LOX10}): When not shared, transition to
R_SPARC_TLS_LE_{HIX22,LOX10}.
(elf32_sparc_relocate_section, R_SPARC_TLS_{LDO,LE}_HIX22): Only
xor relocation with 0xffffffff if R_SPARC_TLS_LE_HIX22.
(elf32_sparc_relocate_section, R_SPARC_TLS_{LDO,LE}_LOX10): Only
or 0x1c00 into relocation if R_SPARC_TLS_LE_HIX22.

* ld-sparc/tlssunbin32.dd: Update for TLS relocation fixes.
* ld-sparc/tlssunbin32.rd: Likewise.
* ld-sparc/tlssunbin32.sd: Likewise.
* ld-sparc/tlssunpic32.dd: Likewise.

merge from gcc

2005-04-11  H.J. Lu  <hongjiu.lu@intel.com>

* coffcode.h (STRING_SIZE_SIZE): Updated to match libcoff-in.h.

binutils/
2005-04-11  Jan Beulich  <jbeulich@novell.com>

* MAINTAINERS: Add myself as ix86 Intel mode maintainer.

* emultempl/elf32.em (gld${EMULATION_NAME}_stat_needed): Ignore
as_needed libs that were not needed.
(gld${EMULATION_NAME}_check_needed): Likewise.

gdb/
* config/djgpp/fnchange.lst: Remove entries for gdb.gdbserver.
gdb/testsuite/
* Makefile.in (ALL_SUBDIRS): Replace gdb.gdbserver with
gdb.server.
* configure.ac: Likewise.
* configure: Regenerated.
* gdb.gdbserver/Makefile.in: Moved to...
* gdb.server/Makefile.in: ... here.
* gdb.gdbserver/server.c: Moved to...
* gdb.server/server.c: ... here.
* gdb.gdbserver/server-run.exp: Moved to...
* gdb.server/server-run.exp: ... here.

gas/
2005-04-11  Jan Beulich  <jbeulich@novell.com>

* NEWS: Mention these changes and their effects.
* macro.c (get_token): Use is_name_beginner/is_part_of_name/
is_name_ender.
(check_macro): Likewise.
(buffer_and_nest): Likewise. Permit multiple labels. Don't discard
labels together with the closing pseudo-op.
(macro_expand_body): Adjust comment. Range-check input before use.
Adjust mis-spelled diagnostic. Use is_name_beginner.
* read.c (try_macro): New.
(read_a_source_file): New static variable last_eol. Don't list
macro expansion lines more than once. Call try_macro.
(s_macro): Set section of line_label to absolute instead of undefined.
* doc/as.texinfo: Add information on the caveats of these changes.

gas/testsuite/
2005-04-11  Jan Beulich  <jbeulich@novell.com>

* gas/macros/dot.[ls]: New.
* gas/macros/macros.exp: Run new test.

Convert to ISO C90 formatting

* symbols.c (symbol_X_add_number): Change return type to "offsetT *".
* symbols.h (symbol_X_add_number): Update prototype.

*** empty log message ***

daily update

2005-04-10  Eric Christopher  <echristo@redhat.com>

        * symbols.c (symbol_X_add_number): Fix warning.

Update copyright years.

* rs6000-tdep.c (ppc_supply_fpregset): Increment offset by 8 for
floating-point registers.
(ppc_collect_fpregset): Likewise.  Fix collection of registers.

2005-04-10  H.J. Lu  <hongjiu.lu@intel.com>

* config/tc-m68k.c (md_begin): Support 64bit host.
(get_num): Support 64bit BFD on 32bit host.

2005-04-10  H.J. Lu  <hongjiu.lu@intel.com>

* config/tc-mips.c (md_apply_fix3): Fix typos in BFD_RELOC_64.

daily update

*** empty log message ***

* gdb.texinfo (Print Settings): Document "set/show print
pascal_static-members", "set print repeats", "show print
null-stop".  Improve indexing.  Fix documentation of "set print
union".
(Pascal): New section.
(Supported languages): Rename from "Support"; all references
updated.  Add a menu item for Pascal.
(Numbers): Document "set radix.
(Screen Size): Document "set/show pagination".
(MIPS Embedded): Remove "set processor" documentation.
(Remote configuration): Document "set/show X/P/Z-packet",
"set/show read-aux-vector-packet", "set/show remote
symbol-lookup-packet", "set/show remote verbose-resume-packet",
"set/show remoteaddresssize", "set/show remotebaud", "set/show
remotedebug", "set/show remotebreak", "set/show remotedevice",
"set/show remotelogfile".
(Auxiliary Vector): Add reference to the description of the
read-aux-vector-packet setting.
(Set Watchpoints): Add a cross-reference to "set remote
hardware-breakpoint-limit".
(General Query Packets): Add indexing of requests and
cross-references to related commands in "Remote configuration".
(File-I/O Overview, The system call): Fix wording and typos.
(Thread Stops): Add index entries.
(Continuing and Stepping): Document "show step-mode".
(i386): New node.  Document "set/show struct-convention".
(Files): Document "show trust-readonly-sections".
(Calling): Document "set/show unwindonsignal".
(Messages/Warnings): Add index entries.
(Maintenance Commands): Document "set/show watchdog".
(Annotations Overview): Document "show annotate".
(Set Watchpoints): Add index entries.
(Symbols): Fix doc of case-sensitive.
(ABI): Document "show coerce-float-to-double".
(Convenience Vars, Help): Improve indexing.
(Machine Code): Document "show disassembly-flavor".
(Debugging C plus plus): Document "show overload-resolution".
(Value History, Signaling): Add index entries.

* gdb.texinfo (Show): Move @kindex entries to their proper places.
(Processes): Fix wording.
(History, List, Logging output, Define, Symbols, Print Settings):
Improve indexing.

* ppcobsd-tdep.c: Update copyright year.  Include "trad-frame.h"
and "tramp-frame.h".
(ppcobsd_sigtramp_cache_init): New function.
(ppcobsd_sigtramp): New variable.
(ppcobsd_init_abi): Prepend signal trampoline unwinder.
* Makefile.in (ppcobsd-tdep.o): Update dependencies.

* read.c (assign_symbol): Remove const from parm.  Fix xcalloc
call.  Don't do the COFF hacks for multi-emulation gas.  Move
demand_empty_rest_of_line back to caller.
(s_set, equals): demand_empty_rest_of_line here.

PR gas/827
* as.h (rs_dummy): Define.
* symbols.c (symbol_X_add_number): New function.
* symbols.h (symbol_X_add_number): Declare.
* stabs.c (aout_process_stab): Tidy symbol frag setting.
* read.c (assign_symbol): New function, split out from s_set.
Use symbol_find_or_make.  Leave fr_type of dummy frag as rs_dummy.
Fix COFF hacks for multi-emulation gas.
(s_set): Call assign_symbol.  Remove "register" keyword.
(set_zero_frag): New function.
(pseudo_set): Always check for assignment to section syms.
Always set segment and frag of symbol, and likewise extern for
aout/bout.  Handle assignment of sym=sym+/-const specially.  Don't
special case exp.X_add_number non-zero for O_symbol expressions.
(equals): Use assign_symbol.

Dropping mi.

2005-04-08  Andrew Cagney  <cagney@gnu.org>

* MAINTAINERS (GDB/MI): Andrew Cagney, Elena Zannoni, and Fernando
Nasser have decided to step back from GDB/MI.

daily update

*** empty log message ***

* config/tc-xtensa.c (xtensa_create_xproperty_segments): Skip
SEC_MERGE sections.

gdb/testsuite/
* Makefile.in (ALL_SUBDIRS): Add gdb.gdbserver.
* configure.ac: Create gdb.gdbserver/Makefile.
* configure: Regenerated.
* lib/gdbserver-support.exp: New file, derived from
config/gdbserver.exp.
* config/gdbserver.exp: Use gdbserver-support.exp.
* gdb.gdbserver/Makefile.in: New file.
* gdb.gdbserver/server.c: New file.
* gdb.gdbserver/server-run.exp: New file.
gdb/
* config/fnchange.lst: Add testsuite/gdb.gdbserver entries.

* dwarf2-frame.c (struct dwarf2_frame_cache): New field
undefined_retaddr.
(dwarf2_frame_cache): Initialize undefined_retaddr.
(dwarf2_frame_this_id): Return an invalid frame ID if
undefined_retaddr.

2005-04-08  Paul Brook  <paul@codesourcery.com>

* elf32-arm.c (ARM2THUMB_GLUE_SIZE): Rename...
(ARM2THUMB_STATIC_GLUE_SIZE): ... to this.
(ARM2THUMB_PIC_GLUE_SIZE): Define.
(a2t1p_ldr_insn, a2t2p_add_pc_insn, a2t3p_bx_r12_insn): Add.
(elf32_arm_to_thumb_stub): Create PIC stubs.
(record_arm_to_thumb_glue): Use different stub size for relocatable
images.

daily update

*** empty log message ***

Include ldexp.h and ldlang.h so that ldfile.h can use the lang_input_statement
type.

gas/

2005-04-06  H.J. Lu  <hongjiu.lu@intel.com>

* config/tc-i386.c (tc_gen_reloc): Don't turn
BFD_RELOC_X86_64_32S into BFD_RELOC_32.

gas/testsuite/

2005-04-06  H.J. Lu  <hongjiu.lu@intel.com>

* gas/i386/x86-64-pcrel.s: Test R_X86_64_32S.
* gas/i386/x86-64-pcrel.d: Updated.

*** empty log message ***

daily update

test_compiler_info: Return compiler_info if no arguments are given.

Move construction of IA-32 vector types to i386-tdep.c.
* gdbtypes.c (build_builtin_type_vec64i,
build_builtin_type_vec128i): Delete functions.
(builtin_type_vec64i, builtin_type_vec128i): Delete variables.
(build_gdbtypes): Don't initialize them.
(_initialize_gdbtypes): Don't register GDBARCH swap entries for
them.
* gdbtypes.h (builtin_type_vec64i, builtin_type_vec128i): Delete
declarations.
(builtin_type_v2_float, builtin_type_v2_int32,
builtin_type_v4_int16, builtin_type_v8_int8,
builtin_type_v2_double, builtin_type_v4_float,
builtin_type_v2_int64, builtin_type_v4_int32,
builtin_type_v8_int16, builtin_type_v16_int8): Add extern
declarations.
* i386-tdep.c (i386_mmx_type, i386_sse_type): New variables.
(i386_build_mmx_type, i386_build_sse_type): New functions.
(i386_register_type): Call them, rather than referring to
builtin_type_vec64i and builtin_type_vec128i.

po/rw.po: New translation: Kinyarwanda
configure.in (ALL_LINGUAS): Add rw

2005-04-06  Jakub Jelinek  <jakub@redhat.com>

* ldlang.c: Formatting.
(walk_wild_consider_section): Remember return value from wildcardp.
(is_simple_wild): Use strcspn instead of 2 strpbrk calls and strlen.
(wild_spec_can_overlap): Use strcspn instead of strpbrk and strlen.

2005-04-06  Robert O'Callahan  <rocallahan@novell.com>

* ld.h (lean_section_userdata_type): Remove.
(fat_section_userdata_type): Remove file field.
(SECTION_USERDATA_SIZE): Remove.
* ldlang.c (init_os): Eliminate initialization of unused
lean_section_userdata_type.

* ldlang.h (callback_t, walk_wild_section_handler_t): New
typedefs.
(struct lang_wild_statement_struct): Add walk_wild_section_handler
and handler_data fields.
* ldlang.c (callback_t): Removed.
(walk_wild_consider_section, walk_wild_section_general,
section_iterator_callback, find_section, is_simple_wild,
match_simple_wild, walk_wild_section_specs1_wild0,
walk_wild_section_specs1_wild1, walk_wild_section_specs2_wild1,
walk_wild_section_specs3_wild2, walk_wild_section_specs4_wild2,
wild_spec_can_overlap, analyze_walk_wild_section_handler): New
functions.
(lang_add_wild): Call analyze_walk_wild_section_handler.
(walk_wild_section): Renamed to walk_wild_section_general and
created a wrapper function.
(section_iterator_callback_data): New typedef.

2005-04-06  Nick Clifton  <nickc@redhat.com>
    H.J. Lu  <hongjiu.lu@intel.com>

* po/rw.po: New translation: Kinyarwanda.
* configure.in (ALL_LINGUAS): Add rw.
* configure: Regenerate.

2005-04-06  Paolo Bonzini  <bonzini@gnu.org>

        * Makefile.tpl (BUILD_CONFIGARGS): Include --with-build-subdir.
(TARGET_CONFIGARGS): Include --with-target-subdir.
(configure, all): New macros.  Use them throughout.

*** empty log message ***

daily update

* config/tc-xtensa.c (branch_align_power): New.
(xtensa_find_unaligned_branch_targets, get_aligned_diff,
future_alignment_required): Use branch_align_power to check section
alignment as well as xtensa_fetch_width when aligning branch targets.

* config/tc-xtensa.c: Warning fixes throughout.
(xtensa_fetch_width): Change to unsigned.
(assemble_nop, xtensa_find_unaligned_branch_targets,
xtensa_find_unaligned_loops, xg_assemble_vliw_tokens,
is_narrow_branch_guaranteed_in_range, xtensa_fix_close_loop_end_frags,
min_bytes_to_other_loop_end, unrelaxed_frag_min_size,
unrelaxed_frag_max_size, xtensa_fix_short_loop_frags,
count_insns_to_loop_end, unrelaxed_frag_min_insn_count,
get_text_align_max_fill_size, get_text_align_nop_count,
get_text_align_nth_nop_size, get_noop_aligned_address,
get_aligned_diff, convert_frag_align_next_opcode,
convert_frag_immed_finish_loop, xtensa_create_property_segments,
xtensa_create_xproperty_segments, xt_block_aligned_size): Clean up
types, avoiding size_t and using offsetT and addressT appropriately.
(get_text_align_power): Clean up types.  Avoid incorrect bound.
(get_text_align_fill_size): Clean up types.  Restructure for clarity.

* elf64-ppc.c (dec_dynrel_count): New function split out from
ppc64_elf_edit_toc, with additional code from ppc64_elf_edit_opd.
(ppc64_elf_edit_toc, ppc64_elf_edit_opd): Use it.
(ppc64_elf_tls_optimize): Likewise.

2005-04-05  Paolo Bonzini  <bonzini@gnu.org>

* Makefile.tpl: Sync with gcc.
* Makefile.in: Regenerate.

Provide .wcookie section for OpenBSD/sparc64.

New translation: Kinyarwanda

* elfxx-mips.c (MIPS_ELF_OPTIONS_SECTION_NAME_P): New macro.
(_bfd_mips_elf_section_from_shdr): Use it to check for recognized
SHT_MIPS_OPTIONS names.  Allow all sections with unrecognised
section flags.
(_bfd_mips_elf_fake_sections): Use MIPS_ELF_OPTIONS_SECTION_NAME_P
to check for SHT_MIPS_OPTIONS sections.
(_bfd_mips_elf_set_section_contents): Likewise.

2005-04-04  Eric Christopher  <echristo@redhat.com>

* elfxx-mips.c (_bfd_elf_mips_get_relocated_section_contents):
Clean up gp handling code.

bfd/

2005-04-04  H.J. Lu  <hongjiu.lu@intel.com>

* elf.c (bfd_elf_set_group_contents): Ignore linker created
group section.
(assign_section_numbers): Accept link_info. Check SHT_GROUP
sections for relocatable files only. Remove the linker created
group sections.
(_bfd_elf_compute_section_file_positions): Pass link_info to
assign_section_numbers.

* elfxx-ia64.c (elfNN_ia64_object_p): New.
(elf_backend_object_p): Defined.

gas/

2005-04-04  H.J. Lu  <hongjiu.lu@intel.com>

* config/tc-ia64.c (start_unwind_section): Undo the change
of 2004-08-18.
(generate_unwind_image, dot_endp): Likewise.

2005-04-04  H.J. Lu  <hongjiu.lu@intel.com>

* elf.c (bfd_elf_set_group_contents): Ignore linker created
group section.

*** empty log message ***

daily update

merge from gcc

Condense the two tests into one and add a "-M entry:" for the second label.

2005-04-04  H.J. Lu  <hongjiu.lu@intel.com>

* elf-bfd.h (elf_section_data): Use (sec) instead of sec.

Fix typo.

* readelf.c (debug_apply_rela_addends): Reorder r_info as
necessary for 64-bit MIPS.

* doc/binutils.texi (readelf): Remove a duplicate paragraph.

Add a check for <unistd.h> providing a prototype for getopt() which is compatible
with the one in include/getopt.h.  If so then define HAVE_DECL_GETOPT.

Add a check to see if the section for the symbol is chosen using
process_section_p.

Initialise value to zero to avoid a compile time warning.

daily update

*** empty log message ***

Apply patch for binutils bug 806, approved by nickc@redhat.com.

2005-04-03  Fred Fish  <fnf@specifixinc.com>
* dwarf2.c (struct dwarf2_debug): Add dwarf_ranges_buffer and
dwarf_ranges_size members.
(struct comp_unit): Add base_address member.
(struct funcinfo): Replace low/high members with an arange.
(arange_add): Replace incoming "unit" parameter with "abfd" and
"first_arange" pointers.  Reorganize/rewrite function body.
(decode_line_info): Change arange_add call to pass bfd and arange
pointers.
(lookup_address_in_line_info_table): Use arange list instead of
individual low/high members.  Walk function's arange list to find
lowest PC in list, to test for overlapping functions.
(read_debug_ranges): New function, reads the debug_ranges section.
(lookup_address_in_function_table): Use arange list instead of
individual low/high members.  Rewrite to find smallest range that
matches.
(read_rangelist): Read a given rangelist from debug_ranges.
(scan_unit_for_functions): Use arange list instead of individual
low/high members.  Handle a DW_AT_ranges attribute.
(parse_comp_unit): Use arange list instead of individual low/high
members.  Save comp unit base address.  Handle a DW_AT_ranges
attribute.

merge from gcc

daily update

*** empty log message ***

* mips-linux-tdep.c (mips_linux_o32_sigframe_init): Adjust
big-endian correction code to not offset 32-bit registers.
Locate floating point registers correctly.

(Targets): Document "set/show architecture".  Remove
redundant index entry for "target" command.
(Backtrace): Add index entries.
(Symbols, Fortran): Document the "set case-sensitive" command.
(DJGPP Native): Document "set com1base", "set com1irq", etc.
(Print Settings): Add index entry for "set demangle-style".
(Target Commands): Document "set download-write-size".
(Debugging Output): Document "set exec-done-display".

Fix typo.

* main.c: Update copyright year.
(captured_main): Avois using strcpy and strcat.

merge from gcc

(Files): Fix the name and documentation of
add-shared-symbol-files.  Document its alias assf.  Update the
list of OSs where GDB supports shared libraries.  Fix markup.
(Continuing and Stepping): Add reference to @var{location} in the
text.
(Dump/Restore Files): Fix reference to @{filename}.
(Help): Fix wording.
(Attach): Ditto.
(Set Watchpoints): Ditto.
(Backtrace): Remove redundant index entries.  Improve index
entries.
(Delete Breaks): Fix wording.
(Memory): Document the compare-sections command.
(Memory Region Attributes): Improve wording.
(Disabling): Improve wording.
(Fortran): New subsection.  Document the "info common" command.
(Help): Document aliases "info copying" and "info warranty".
(Caching Remote Data): New section.  Document the "set/show
remotecache" and "info dcache" commands.
(Show): Fix wording of the documentation of the "set
extension-language" command.
(Signals): Add index entry for "info handle".
(Memory Region Attributes): Fix punctuation.
(Symbols): Change the arg name to "location" and refer to it in
the text.  Fix wording of "info types" doc.
(Threads): Fix usage of @enumerate @item's.
(Listing Tracepoints): Add index entry for "info tp".
(Set Watchpoints): Add xref to "info break" description.
(Macros): Add an index entry for "macro exp1".  Document the
"macro list" command.
(Maintenance Commands): Document "flushregs", "maint agent",
"maint check-symtabs", "maint cplus", "maint demangle", "maint
deprecate", "maint undeprecate", "maint dump-me", "maint packet",
"maint print architecture", "maint print objfiles", "maint print
statistics", "maint print type", "maint show-debug-regs", "maint
space", "maint time", and "maint translate-address".
(Connecting): Document the "monitor" command.
(Annotations Overview): Describe the "set annotate" command.

* cp-demangle.c: Update copyright.

(Set Watchpoints): Document can-use-hw-watchpoints.
Rearrange index entries and improve wording about support for
hardware watchpoints.

2005-04-01  Michael Snyder  <msnyder@redhat.com>

* dummy-frame.c (dummy_frame_sniffer): Optimization: don't bother
computing this_id if there are no dummy frames on the stack.

Patch from David Mosberger, to avoid nop.f on Itanium2.
* config/tc-ia64.c (ia64_handle_align): Move le_nop and
le_nop_stop arrays and initializers to file scope.
(md_begin): When generating code for anything other than
Itanium 1, use MMI instead of MFI NOP bundles as a filler.

2005-04-01  Michael Snyder  <msnyder@redhat.com>

* mn10300-tdep.c (mn10300_frame_unwind_cache): Use
find_partial_func instead of unwind_pc to identify frame.
(mn10300_push_dummy_call): Handle struct args, struct_return.

2005-04-01  Michael Snyder  <msnyder@redhat.com>

* mn10300-prologue.c (set_movm_offsets): Don't test variable
before setting it.
* mn10300-tdep.c (mn10300_skip_prologue): Use analyze_prologue
instead of skip_prologue_using_sal.