2007-03-25  Paul Brook  <paul@codesourcery.com>

gas/
* config/tc-arm.c (T2_SUBS_PC_LR): Define.
(do_t_add_sub): Correctly encode subs pc, lr, #const.
(do_t_mov_cmp): Correctly encode movs pc, lr.

gas/testsulte/
* gas/arm/thumb32.s: Add tests for subs pc, lr.
* gas/arm/thumb32.d: Change error-output: to stderr:.
Update expected output.

2007-05-25  Eric Christopher  <echristo@apple.com>

        * elf-eh-frame.c (_bfd_elf_discard_section_eh_frame):
        Check that sym_sec isn't NULL before accessing.

2007-05-25  Andreas Tobler  <a.tobler@schweiz.org>

        * ltmain.sh: Fix Darwin verstring, remove ${wl}.

daily update

* regenerated files from updating libtool.

* ltmain.sh: Update from GCC.
* libtool.m4: Update from GCC.
* ltsugar.m4: New. Update from GCC.
* ltversion.m4: New. Update from GCC.
* ltoptions.m4: New. Update from GCC.
* ltconfig: Remove.
* ltcf-c.sh: Remove.
* ltcf-cxx.sh: Remove.
* ltcf-gcj.sh: Remove.
* src-release: Update with new libtool file list.
* newlib/*/configure.in: invoke _LD_DECL_SED.
* newlib/*/Makefile.am: Ensure toplevel is included in ACLOCAL_AMFLAGS.
* Regenerate subdirectories

2007-05-24  H.J. Lu  <hongjiu.lu@intel.com>

* gprof.texi: Remove orphaned "@end ignore".

* rcparse.y: Join strings for elements having no side-effects in "rc"-grammar.
* testsuite/binutils-all/windres/version_cat.rc: New.
* testsuite/binutils-all/windres/version_cat.rsd: New.

* ldlex.l: ASSERT is recognized in SCRIPT env.  NAMES cannot
contain commas in EXP env.
* ldgram.y (extern_name_list): Push to EXP env, move body to ...
(extern_name_list_body): ... here.
(script_file, ifile_list): Reformat.
(statement): Add ASSERT.
testsuite:
* ld-scripts/assert.t: Add additional cases.
* ld-scripts/extern.t, ld-scripts/extern.s,
ld-scripts/extern.exp: New.

daily update

2007-05-23  Paolo Bonzini  <bonzini@gnu.org>

PR bootstrap/32009
* mh-ppc-darwin: Temporarily disable.

Updated windres tool

daily update

* doc/c-xtensa.texi (Xtensa Automatic Alignment): Remove statements
and index entries about automatic alignment of ENTRY instructions.

2007-05-22  Paul Brook  <paul@codesourcery.com>

ld/testsuite/
* ld-arm/arm-pic-veneer.d: Update expected output.
* ld-arm/arm-call.d: Ditto.

bfd/
* elf32-arm.c (output_arch_syminfo): Replace plt_shndx and plt_offset
with sec and sec_shndx.
(elf32_arm_ouput_plt_map_sym): Use them.
(elf32_arm_output_arch_local_syms): Output mapping symbols for
interworking glue.

2007-05-22  Paul Brook  <paul@codesourcery.com>

bunutils/
* objdump.c (find_symbol_for_address): Merge section and target
specific filtering code.

ld/testsuite/
* ld-arm-mixed-lib.d: Update expected output.
* ld-arm/arm-app.d: Ditto.
* ld-arm/mixed-app.d: Ditto.
* ld-arm/arm-lib-plt32.d: Ditto.
* ld-arm/arm-app-abs32.d: Ditto.
* ld-arm/mixed-app-v5.d: Ditto.
* ld-arm/armthumb-lib.d: Ditto.
* ld-arm/arm-lib.d: Ditto.

gas/testsuite/
* gas/arm/backslash-at.d: Update expected output.

Use @copying around copyright notices

daily update

* bfdint.texi: Add GNU Free Documentation License notice.

Move entry for modification to dwarf2.h (for adding ability to report
when a variable's value is uninitialized) to the correct ChangeLog file.

moved to the attic to please handling of src-support module

add this momentarily, will move them to the attic soon

binutils/
* objdump.c (disassemble_bytes): Ignore disassembler_needs_relocs
for executables and shared libraries.

ld/testsuite/
* ld-arm/emit-relocs1.d, ld-arm/emit-relocs1.s,
* ld-arm/emit-relocs1-vxworks.d: New tests.
* ld-arm/arm-elf.exp: Run them.
* ld-arm/vxworks1.dd: Expect proper branch targets.

daily update

daily update

daily update

Add ability to report when a variable's value is uninitialized,
based on information provided by the compiler.  Also add new
DWARF OP, DW_OP_GNU_uninit, for this purpose.

* ld-elf/group.ld: Discard .reginfo.

* config/tc-mips.c (s_mipsset): Use generic s_set for directives
containing a comma.

ld/
* emulparams/elf32ebmipvxworks.sh (OTHER_READONLY_SECTIONS)
(OTHER_READWRITE_SECTIONS): Define.  Add .rdata sections.

* objcopy.c (strip_main): Detect identical input and output file
names.
(copy_main): Refactor tempname detection and use.

* ppc-dis.c (print_insn_powerpc): Don't skip all operands
after setting skip_optional.

2007-05-18  Paul Brook  <paul@codesourcery.com>

bfd/
* elf32-arm.c (ARM2THUMB_V5_STATIC_GLUE_SIZE): Define.
(a2t1v5_ldr_insn, a2t1v5_ldr_insn): New.
(record_arm_to_thumb_glue): Add v5t non-pic glue.
(elf32_arm_create_thumb_stub): Ditto.

ld/testsuite/
* ld-arm/arm-call.d: Update expected output.

daily update

Move testsuite entries to testsuite/ChangeLog.

2007-05-17  H.J. Lu  <hongjiu.lu@intel.com>

PR gas/4517
2003-06-05  Michal Ludvig  <mludvig@suse.cz>
* as.texinfo: Document new directives: .cfi_restore,
.cfi_undefined, .cfi_same_value, .cfi_return_column,
.cfi_remember_state and .cfi_restore_state.

2007-05-17  H.J. Lu  <hongjiu.lu@intel.com>

2003-06-05  Michal Ludvig  <mludvig@suse.cz>
* testsuite/gas/cfi/cfi-x86_64.s: Test new directives
and different writings of registers and numbers.
* testsuite/gas/cfi/cfi-x86_64.d: Updated pattern to
match the above change.

2007-05-17  Paul Brook  <paul@codesourcery.com>

ld/testsuite/
* ld-elf/multibss1.s: Use %nobits instead of @nobits.

* ld-m68k/merge-error-1a.d: Mismatch is an error.
* ld-m68k/merge-error-1b.d: Likewise.
* ld-m68k/merge-error-1c.d: Likewise.
* ld-m68k/merge-error-1d.d: Likewise.
* ld-m68k/merge-error-1e.d: Likewise.

* config/tc-m68k.c (md_apply_fix): Show value of out of range
fixups in error message.
(md_conver_frag_1): Propagate the fix source location and use
as_bad_where rather than fatal, for better error messages.

* objdump.c (load_debug_section): Select bias for DWARF debug addresses based on the flavour of the bfd.

* ppc-dis.c (operand_value_powerpc, skip_optional_operands): New.
(print_insn_powerpc): Use the new operand_value_powerpc and
skip_optional_operands functions to omit or print all optional
operands as a group.
* ppc-opc.c (BFF, W, XFL_L, XWRA_MASK): New.
(XFL_MASK): Delete L and W bits from the mask.
(mtfsfi, mtfsfi.): Replace use of BF with BFF.  Relpace use of XRA_MASK
with XWRA_MASK.  Use W.
(mtfsf, mtfsf.): Use XFL_L and W.

* binutils-all/strip-3.d: Strip .pdr section.

daily update

2007-05-16  Paul Brook  <paul@codesourcery.com>

* config/tc-arm.c (v7m_psrs): Add uppercase PSR names and xpsr.

Add support for SHF_MERGE sections.

2007-05-16  H.J. Lu  <hongjiu.lu@intel.com>
    Alan Modra  <amodra@bigpond.net.au>

* elflink.c (_bfd_elf_adjust_dynamic_copy): Align dynamic bss
section to the minimum alignment.

2007-05-16  Paolo Bonzini  <bonzini@gnu.org>

* Makefile.def (bootstrap_stage): Replace stage_make_flags with
stage_cflags.
* Makefile.tpl (POSTSTAGE1_HOST_EXPORTS, POSTSTAGE1_FLAGS_TO_PASS):
Remove CFLAGS/LIBCFLAGS.
(configure-stage[+id+]-[+prefix+][+module+],
all-stage[+id+]-[+prefix+][+module+]): Pass it from [+stage_cflags+].
* Makefile.in: Regenerate.

ld/
* configure.in: Allow sysroots to be relocated under $prefix as
well as $exec_prefix.
* configure: Regenerate.

daily update

2007-05-15  H.J. Lu  <hongjiu.lu@intel.com>

PR ld/4504
* ld-elf/data1.c: New file.
* ld-elf/data1.h: Likewise.
* ld-elf/dynbss1.c: Likewise.
* ld-elf/pass.out: Likewise.

* ld-elf/shared.exp (build_tests): Add "Build libdata1.so".
(run_tests): Add "Run with libdata1.so".

2007-05-15  H.J. Lu  <hongjiu.lu@intel.com>
    Alan Modra  <amodra@bigpond.net.au>

PR ld/4504
* elf-bfd.h (_bfd_elf_adjust_dynamic_copy): New.
* elflink.c (_bfd_elf_adjust_dynamic_copy): New.

* elf-m10300.c (_bfd_mn10300_elf_adjust_dynamic_symbol): Call
_bfd_elf_adjust_dynamic_copy to adjust for the copy in dynamic
bss section.
* elf32-arm.c (elf32_arm_adjust_dynamic_symbol): Likewise.
* elf32-cris.c (elf_cris_adjust_dynamic_symbol): Likewise.
* elf32-hppa.c (elf32_hppa_adjust_dynamic_symbol): Likewise.
* elf32-i370.c (i370_elf_adjust_dynamic_symbol): Likewise.
* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Likewise.
* elf32-m32r.c (m32r_elf_adjust_dynamic_symbol): Likewise.
* elf32-m68k.c (elf_m68k_adjust_dynamic_symbol): Likewise.
* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Likewise.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Likewise.
* elf32-sh.c (sh_elf_adjust_dynamic_symbol): Likewise.
* elf32-vax.c (elf_vax_adjust_dynamic_symbol): Likewise.
* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol): Likewise.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Likewise.
* elf64-sh64.c (sh64_elf64_adjust_dynamic_symbol): Likewise.
* elf64-x86-64.c (elf64_x86_64_adjust_dynamic_symbol): Likewise.
* elfxx-mips.c (_bfd_mips_vxworks_adjust_dynamic_symbol): Likewise.
* elfxx-sparc.c (_bfd_sparc_elf_adjust_dynamic_symbol): Likewise.

ld/testsuite/
* ld-arm/vxworks1.ld: Swap .bss and .data.
* ld-arm/vxworks1-lib.rd: Update accordingly.
* ld-arm/vxworks1-lib.td: New test.
* ld-arm/arm-elf.exp: Run it.

* ld-i386/vxworks1.ld: Swap .bss and .data.
* ld-i386/vxworks1-lib.rd: Update accordingly.
* ld-i386/vxworks1-lib.td: New test.
* ld-i386/i386.exp: Run it.

* ld-mips-elf/vxworks1.ld: Swap .bss and .data.
* ld-mips-elf/vxworks1-lib.rd: Update accordingly.
* ld-mips-elf/vxworks1.rd: Likewise.

* ld-powerpc/vxworks1.ld: Swap .bss and .data.
* ld-powerpc/vxworks1-lib.rd: Update accordingly.
* ld-powerpc/vxworks1-lib.td: New test.
* ld-powerpc/powerpc.exp: Run it.

* ld-sh/vxworks1.ld: Swap .bss and .data.
* ld-sh/vxworks1-lib.rd: Update accordingly.
* ld-sh/vxworks1-lib.td: New test.
* ld-sh/sh-vxworks.exp: Run it.

* ld-sparc/vxworks1.ld: Swap .bss and .data.
* ld-sparc/vxworks1-lib.rd: Update accordingly.
* ld-sparc/vxworks1-lib.td: New test.
* ld-sparc/sparc.exp: Run it.

bfd/
* elfxx-mips.c (mips_elf_create_local_got_entry): Remove
input_section argument.  Create .rela.dyn relocations against
symbol 0 rather than the section symbol.
(mips_elf_local_got_index): Remove input_section argument.
Update call to mips_elf_create_local_got_entry.
(mips_elf_got_page, mips_elf_got16_entry): Likewise.
(mips_elf_calculate_relocation): Update calls to
mips_elf_local_got_index, mips_elf_got16_entry and mips_elf_got_page.

ld/testsuite/
* ld-mips-elf/vxworks1-lib.rd: Expect the GOT relocation to be
against symbol 0.

gas/
* app.c (do_scrub_chars): Don't damage \@ pseudo-variables.

gas/testsuite/
* gas/arm/backslash-at.d: New.
* gas/arm/backslash-at.s: New.

bfd/
* elf32-arm.c (elf32_arm_final_link_relocate): Correctly
handle the Thumb-2 JUMP19 relocation.

ld/testsuite/
* ld-arm/arm-elf.exp: Add jump19 testcase.
* ld-arm/jump19.d: New.
* ld-arm/jump19.s: New.

PR gas/3041
* config/tc-m68k.c (relaxable_symbol): Make sure that the correct addend is stored for relocs against weak symbols.
    (md_apply_fix): So not loose track of addend for relocs against weak symbols.
* testsuite/gas/m68k/p3041.s: New test case.
* testsuite/gas/m68k/p3041.d: New expected disassembly.
* testsuite/gas/m68k/all.exp: Run new test for m68k-*-netbsd toolchains.
    Only run arch-cpu-1 test for ELF based toolchains.

    Tidy ups for m68k-netbsd gas toolchain:
* testsuite/gas/m68k/cpu32.d: Allow for extra text after expected disassembly.
* testsuite/gas/m68k/mcf-trap.d: Allow for alternative trap mnemonics.
* testsuite/gas/m68k/br-isab.d: Fix name of test.
* testsuite/gas/m68k/br-isac.d: Fix name of test.

PR 4479
* elf.c (elf_fake_sections): Don't allow backend to change
SHT_NOBITS if called for strip/objcopy --only-keep-debug.
* elfxx-mips.c (_bfd_mips_elf_fake_sections): Remove similar
fix from here.

* binutils-all/objcopy.exp: Only run needed-by-reloc test for ELF.

gas/testsuite/

2007-05-14  H.J. Lu  <hongjiu.lu@intel.com>

PR binutils/4502
* gas/i386/amd.d: Replace "pfmulhrw" with "pmulhrw".

opcodes/

2007-05-14  H.J. Lu  <hongjiu.lu@intel.com>

PR binutils/4502
* i386-dis.c (Suffix3DNow): Replace "pfmulhrw" with "pmulhrw".

daily update

2007-05-14  H.J. Lu  <hongjiu.lu@intel.com>

* hist.c (scale_and_align_entries): Avoid C99 feature.

* config/tc-mips.c (md_parse_option): Fix parsing of -O option.

ld/testsuite/
* ld-sh/vxworks1.dd: Remove hexadecimal prefixes from constant pool
contents.  Consistently use "!" as the comment character.
Consistently use _PROCEDURE_LINKAGE_TABLE_ in the first PLT entry.
* ld-sh/vxworks1-le.dd: Likewise.
* ld-sh/vxworks1-lib.dd: Likewise.
* ld-sh/vxworks1-lib-le.dd: Likewise.
* ld-sh/vxworks3.dd: Likewise.
* ld-sh/vxworks3-le.dd: Likewise.

2007-05-14  Mei Ligang  <ligang@sunnorth.com.cn>

* config/tc-score.c (data_op2, validate_immediate): Fix bug for addri, addri.c, subi, and
subi.c when immediate number is hex.
(score_insns): Remove subis and subis.c.
(do_sub_rdi16): Delete.

* emultempl/ppc64elf.em (gld${EMULATION_NAME}_new_vers_pattern):
Handle null pattern.

testsuite/:
* ld-elf/dl2a.list: New file.
* ld-elf/shared.exp: Add test using --dynamic-list=dl2a.list.

* elf.c (bfd_elf_string_from_elf_section): Return NULL on
invalid shstrndx.
(bfd_elf_get_str_section): Likewise.

daily update

daily update

PR 4497
* elf-eh-frame.c (struct cie): Add "local_personality".  Make
"personality" a union.
(cie_eq): Compare local_personality too.  Adjust personality
comparison.
(_bfd_elf_discard_section_eh_frame): Check binding on personality
reloc sym to allow for bad symtab.  Use stashed local syms rather
than reading personality local sym.  Handle discarded sections.

include/elf/
* spu.h (R_SPU_ADDR16X): Define.
(R_SPU_PPU32, R_SPU_PPU64): Renumber.
bfd/
* elf32-spu.c (elf_howto_table): Add howto for R_SPU_ADDR16X.

daily update

PR 4479
* objcopy.c (copy_object): Don't copy ELF program headers for
--only-keep-debug.

* binutils-all/needed-by-reloc.s: Use .long rather than .4byte.

bfd/
* elf32-ppc.h (ppc_elf_select_plt_layout): Update prototype.
(enum ppc_elf_plt_type): Move from..
* elf32-ppc.c: ..here.
(struct ppc_elf_obj_tdata): Add makes_plt_call and has_rel16.
(struct ppc_elf_link_hash_table): Reorder.  Add old_bfd.  Delete
can_use_new_plt.  Make is_vxworks a bitfield.
(ppc_elf_link_hash_table_create): Don't clear is_vxworks (again).
(ppc_elf_check_relocs): Update setting of reloc flags.  Set old_bfd.
(ppc_elf_select_plt_layout): Modify parameters.  Use bfd reloc
flags to better detect object files needing old bss-style plt.
Allow secure plt to be used without rel16 relocs being detected.
Warn if secure plt request cannot be allowed.
ld/
* emultempl/ppc32elf.em (plt_style): New variable.
(old_plt): Delete.
(ppc_after_open): Adjust ppc_elf_select_plt_layout call.
(PARSE_AND_LIST_PROLOGUE): Define OPTION_NEW_PLT, renumber
OPTION_OLD_PLT, OPTION_OLD_GOT and OPTION_STUBSYMS.
(PARSE_AND_LIST_LONGOPTS, PARSE_AND_LIST_OPTIONS): Add secure-plt.
(PARSE_AND_LIST_ARGS_CASES): Handle OPTION_NEW_PLT.
* ld.texinfo (--secure-plt): Document.

include/elf/
* spu.h (R_SPU_PPU32, R_SPU_PPU64): Define.
bfd/
* reloc.c (BFD_RELOC_SPU_PPU32, BFD_RELOC_SPU_PPU64): Define.
* elf-bfd.h (struct elf_backend_data): Change return type of
elf_backend_relocate_section to int.
* elf32-spu.c (elf_howto_table): Add howtos for R_SPU_PPU32 and
R_SPU_PPU64.
(spu_elf_bfd_to_reloc_type): Convert new relocs.
(spu_elf_count_relocs): New function.
(elf_backend_count_relocs): Define.
(spu_elf_relocate_section): Arrange to emit R_SPU_PPU32 and
R_SPU_PPU64 relocs.
* elflink.c (elf_link_input_bfd): Emit relocs if relocate_section
returns 2.
* bfd-in2.h: Regenerate.
* libbfd.h: Regenerate.
gas/
* config/tc-spu.c (md_pseudo_table): Add int, long, quad.  Call
spu_cons for word.
(md_assemble): Tidy use of insn.flag.
(get_imm): Likewise.  Handle uppercase input too.
(spu_cons): New function.
* config/tc-spu.h (tc_fix_adjustable): Don't adjust SPU_PPU relocs.
(TC_FORCE_RELOCATION): Don't resolve them either.
binutils/
* embedspu.sh (find_prog): Prefer prog in same dir as embedspu
over one found on the users path.
(main): Generate .reloc for each R_SPU_PPU* reloc.

daily update

2007-05-10  H.J. Lu  <hongjiu.lu@intel.com>

* i386-opc.h (ShortForm): Redefined.
(Jump): Likewise.
(JumpDword): Likewise.
(JumpByte): Likewise.
(JumpInterSegment): Likewise.
(FloatMF): Likewise.
(FloatR): Likewise.
(FloatD): Likewise.
(Size16): Likewise.
(Size32): Likewise.
(Size64): Likewise.
(IgnoreSize): Likewise.
(DefaultSize): Likewise.
(No_bSuf): Likewise.
(No_wSuf): Likewise.
(No_lSuf): Likewise.
(No_sSuf): Likewise.
(No_qSuf): Likewise.
(No_xSuf): Likewise.
(FWait): Likewise.
(IsString): Likewise.
(regKludge): Likewise.
(IsPrefix): Likewise.
(ImmExt): Likewise.
(NoRex64): Likewise.
(Rex64): Likewise.
(Ugh): Likewise.

bfd/
* elf32-arm.c (elf32_arm_check_relocs): Don't create PLT entries
for R_ARM_ABS12 relocs.
(elf32_arm_finish_dynamic_symbol): Fix the loop that creates
non-shared VxWorks PLT entries.

ld/testsuite/
* ld-arm/vxworks1-lib.dd: Expect "push" instead of stmdb and
"pop" instead of ldmia.  Don't require specific symbolic addresses
for in-text addresses.  Expect data to be rendered as .words rather
than disassembled.
* ld-arm/vxworks1.dd: Likewise.

PR 4454
* elf-eh-frame.c (struct cie): Make "personality" a bfd_vma.
(_bfd_elf_discard_section_eh_frame): Handle local syms on
personality relocation.

bfd/
* elf.c (assign_file_positions_for_load_sections): Use p_memsz
rather than p_filesz to calculate the LMA of the end of a segment.

ld/testsuite/
* ld-elf/multibss1.d, ld-elf/multibss1.s: New test.

* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol): Don't do copyreloc
processing if symbol is defined in the executable.

* elf32-frv.c (_frvfdpic_check_discarded_relocs): New.
(frvfdpic_elf_discard_info): New.
(elf_backend_discard_info): Define for FDPIC.

daily update

    bfd/
        * elf32-arm.c (bfd_elf32_arm_vfp11_erratum_scan): Don't
        attempt to scan if the bfd doesn't correspond to an ELF image.
        (bfd_elf32_arm_vfp11_fix_veneer_locations): Likewise.

daily update

binutils/testsuite/
* binutils-all/strip-3.d: Strip .ARM.attributes and .reginfo
sections.

* elf32-frv.c (elf32_frv_relocate_section): Discard dynamic relocs
for which _bfd_elf_section_offset returns -1.

* elf32-spu.c (spu_elf_size_stubs): Use "void *" for psyms.
(mark_functions_via_relocs): Likewise.

merge from gcc

daily update

2007-05-07  H.J. Lu  <hongjiu.lu@intel.com>

* i386-dis.c (threebyte_0x38_uses_DATA_prefix): Correct entries
for some SSE4 instructions.
(threebyte_0x3a_uses_DATA_prefix): Likewise.

* ld.h (args_type, ld_config_type): Reorder fields.
* ldmain.c (main): Don't initialise a bunch of vars we know are
zero already.

* elflink.c (bfd_elf_final_link): Correct reloc handling for
elf_backend_count_relocs.
(bfd_elf_discard_info): Print an error if we can't read syms.

* elf32-spu.c (spu_elf_reloc_type_lookup): Return NULL on
invalid reloc code.
(spu_elf_gc_mark_hook, spu_elf_section_processing): Delete functions.
(elf_backend_gc_mark_hook, elf_backend_section_processing): Don't
define.

* elf.c (assign_file_positions_for_load_sections): Don't check
core segment.

daily update

* cp-demangle.c (d_name): Detect local-source-name.
(d_prefix): Likewise.
(d_unqualified_name): Implement local-source-name.

daily update

gas/
* config/tc-arm.c (md_apply_fix): Generate more accurate
diagnostic when 8-bit immediate range is exceeded for
BFD_RELOC_ARM_OFFSET_IMM8.

* multempl/avrelf.em (PARSE_AND_LIST_ARGS_CASES): Add new value for
"--pmem-wrap-around".
(PARSE_AND_LIST_OPTIONS): Describe new value for "--pmem-wrap-around".