diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2023-08-11 17:48:11 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2023-08-12 18:32:43 +0300 |
| commit | 2a25492c13e2b768f94b864a51f84e82e4238aef (patch) | |
| tree | 64102f707447c221fc7b27788cbed43052ed22a5 /poky/meta/recipes-devtools | |
| parent | 6fddef299932b1270a799e78566e25daa911f742 (diff) | |
| download | openbmc-2a25492c13e2b768f94b864a51f84e82e4238aef.tar.xz | |
subtree updates
meta-openembedded: 0e3f5e5201..491b7592f4:
Alexander Kanavin (1):
libadwaita: move recipe to oe-core
Andrej Valek (1):
cve_check: convert CVE_CHECK_IGNORE to CVE_STATUS
Archana Polampalli (1):
yasm: fix CVE-2023-31975
Chase Qi (1):
meta-python: add python3-telnetlib3 package
Chen Qi (3):
iperf3: remove incorrect CVE_PRODUCT setting
open-vm-tools: add CVE_PRODUCT
grpc: fix CVE-2023-32732
Chi Xu (1):
lapack: Add ptest support
Chris Dimich (1):
image_types_sparse: Fix syntax error
Christian Hohnstaedt (1):
android-tools: fix QA warning about buildpaths
Christophe Vu-Brugier (2):
libnvme: add recipe
nvme-cli: upgrade 1.13 -> 2.5
Etienne Cordonnier (1):
uutils-coreutils: upgrade 0.0.19 -> 0.0.20
Gianfranco Costamagna (3):
vbxguestdrivers: upgrade 7.0.8 -> 7.0.10
dlt-daemon: Add patch to fix build with googletest 1.13
gpsd: make sure gps-utils-python runtime-depends on python3-pyserial
JD Schroeder (2):
radvd: Fix groupname gid change warning
cyrus-sasl: Fix groupname gid change warning
Jan Vermaete (1):
openh264: version bump 2.1.1 -> 2.3.1
Jasper Orschulko (1):
yaml-cpp: Fix cmake export
Khem Raj (9):
openwsman: Link with -lm to get floor() definition
portaudio-v19: Update to latest tip of trunk
python3-pyaudio: Fix cross builds
poco: Fix ptests
pcmciautils: Pass LD=CC via Make cmdline
ply: Pass LD via environment to configure
sip: upgrade 6.7.10 -> 6.7.11
nodejs: Upgrade to 18.17.0
python3-m2crypto: Remove __pycache__ files
Marek Vasut (1):
libiio: update to version 0.25
Markus Volk (9):
pipewire: update 0.3.73 -> 0.3.75
libcamera: update 0.0.5 -> 0.1.0
webkitgtk3: add recipe
geary: update 43.0 -> 44.0
webkitgtk3: upgrade 2.40.2 -> 2.40.5
fuse3: update 3.14.1 -> 3.15.1
pipewire: update 0.3.75 -> 0.3.77
pipewire: add support for liblc3
gnome-software: update 44.3 -> 44.4
Martin Jansa (4):
libtommath: add recipe for LibTomMath used by dropbear
libtomcrypt: backport a fix for CVE-2019-17362
libtomcrypt: add PACKAGECONFIG for ltm enabled by default
dlm: Do not use -fcf-protection=full on aarch64 platforms
Michael Opdenacker (7):
remove unused AUTHOR variable
remove unused AUTHOR variable
remove unused AUTHOR variable
remove unused AUTHOR variable
remove unused AUTHOR variable
remove unused AUTHOR variable
meta-python: Remove unused AUTHOR variable
Mingli Yu (2):
dracut: Remove busybox from RRECOMMENDS
mariadb: Upgrade to 10.11.4
Nicolas Marguet (2):
rsyslog: update from 8.2302.0 to 8.2306.0
rsyslog: Fix function inline errors in debug optimization
Peter Marko (1):
cve_check: fix conversion errors
Ramon Fried (1):
bitwise: Upgrade 0.43 -> 0.50
Ross Burton (1):
cherokee: add CVE_PRODUCT
Tim Orling (1):
libmodule-build-tiny-perl: upgrade 0.045 -> 0.046
Trevor Gamblin (31):
python3-django: upgrade 4.2.2 -> 4.2.3
python3-ipython: upgrade 8.12.0 -> 8.14.0
python3-awesomeversion: upgrade 22.9.0 -> 23.5.0
python3-binwalk: upgrade 2.3.3 -> 2.3.4
python3-bitstring: upgrade 3.1.9 -> 4.0.2
python3-bitstring: add python3-io to RDEPENDS, alphabetize
python3-blinker: upgrade 1.5 -> 1.6.2
python3-blinker: add python3-asyncio to RDEPENDS
python3-execnet: upgrade 1.9.0 -> 2.0.2
python3-flask: upgrade 2.2.3 -> 2.3.2
python3-flask: add python3-blinker to RDEPENDS, alphabetize
python3-greenstalk: upgrade 2.0.0 -> 2.0.2
python3-humanize: upgrade 4.4.0 -> 4.7.0
python3-versioneer: add recipe
python3-parse: upgrade 1.19.0 -> 1.19.1
python3-pandas: upgrade 1.5.3 -> 2.0.3
python3-pyperf: upgrade 2.5.0 -> 2.6.1
python3-rdflib: upgrade 6.2.0 -> 6.3.2
python3-semver: upgrade 2.13.0 -> 3.0.1
python3-send2trash: upgrade 1.8.0 -> 1.8.2
python3-sh: upgrade 1.14.3 -> 2.0.4
python3-snagboot: upgrade 1.0 -> 1.1
python3-werkzeug: upgrade 2.2.3 -> 2.3.6
python3-beautifulsoup4: upgrade 4.11.1 -> 4.12.2
python3-fastjsonschema: upgrade 2.16.3 -> 2.18.0
python3-jsonpatch: upgrade 1.32 -> 1.33
python3-m2crypto: upgrade 0.38.0 -> 0.39.0
python3-matplotlib: upgrade 3.6.3 -> 3.7.2
python3-pyaudio: upgrade 0.2.11 -> 0.2.13
python3-pybind11: upgrade 2.10.3 -> 2.11.1
python3-sqlparse: upgrade 0.4.3 -> 0.4.4
Vivien Didelot (1):
libcamera: bump to latest master
Wang Mingyu (83):
c-periphery: upgrade 2.4.1 -> 2.4.2
ctags: upgrade 6.0.20230611.0 -> 6.0.20230716.0
gensio: upgrade 2.6.6 -> 2.6.7
gnome-commander: upgrade 1.16.0 -> 1.16.1
hiredis: upgrade 1.1.0 -> 1.2.0
iperf3: upgrade 3.13 -> 3.14
iwd: upgrade 2.6 -> 2.7
libbytesize: upgrade 2.8 -> 2.9
libinih: upgrade 56 -> 57
libnftnl: upgrade 1.2.5 -> 1.2.6
lvgl: upgrade 8.3.7 -> 8.3.8
bats: upgrade 1.9.0 -> 1.10.0
function2: upgrade 4.2.2 -> 4.2.3
lmdb: upgrade 0.9.29 -> 0.9.31
redis: upgrade 6.2.12 -> 6.2.13
ser2net: upgrade 4.3.12 -> 4.3.13
python3-obd: upgrade 0.7.1 -> 0.7.2
python3-path: upgrade 16.6.0 -> 16.7.1
nginx: upgrade 1.24.0 -> 1.25.1
php: upgrade 8.2.7 -> 8.2.8
python3-charset-normalizer: upgrade 3.1.0 -> 3.2.0
python3-click: upgrade 8.1.3 -> 8.1.5
python3-dnspython: upgrade 2.3.0 -> 2.4.0
python3-engineio: upgrade 4.4.1 -> 4.5.1
python3-eth-utils: upgrade 2.1.1 -> 2.2.0
python3-frozenlist: upgrade 1.3.3 -> 1.4.0
python3-gevent: upgrade 22.10.2 -> 23.7.0
python3-google-api-python-client: upgrade 2.92.0 -> 2.93.0
python3-google-auth: upgrade 2.21.0 -> 2.22.0
python3-mock: upgrade 5.0.2 -> 5.1.0
python3-platformdirs: upgrade 3.8.0 -> 3.9.1
python3-protobuf: upgrade 4.23.3 -> 4.23.4
python3-pymisp: upgrade 2.4.172 -> 2.4.173
python3-pymongo: upgrade 4.4.0 -> 4.4.1
python3-tox: upgrade 4.6.3 -> 4.6.4
python3-virtualenv: upgrade 20.23.1 -> 20.24.0
python3-zeroconf: upgrade 0.70.0 -> 0.71.0
redis-plus-plus: upgrade 1.3.9 -> 1.3.10
redis: upgrade 7.0.11 -> 7.0.12
smemstat: upgrade 0.02.11 -> 0.02.12
tesseract: upgrade 5.3.1 -> 5.3.2
weechat: upgrade 4.0.1 -> 4.0.2
wireshark: upgrade 4.0.6 -> 4.0.7
xterm: upgrade 383 -> 384
lastlog2: add new recipe
wtmpdb: add new recipe
babeld: upgrade 1.12.2 -> 1.13.1
ctags: upgrade 6.0.20230716.0 -> 6.0.20230730.0
gspell: upgrade 1.12.1 -> 1.12.2
libcompress-raw-bzip2-perl: upgrade 2.204 -> 2.206
libcompress-raw-lzma-perl: upgrade 2.204 -> 2.206
libcompress-raw-zlib-perl: upgrade 2.204 -> 2.206
libio-compress-lzma-perl: upgrade 2.204 -> 2.206
libio-compress-perl: upgrade 2.204 -> 2.206
libqb: upgrade 2.0.7 -> 2.0.8
logcheck: upgrade 1.4.2 -> 1.4.3
mdio-tools,mdio-netlink: Upgrade recipes to 1.3.0
python3-dill: upgrade 0.3.6 -> 0.3.7
python3-gunicorn: upgrade 20.1.0 -> 21.2.0
python3-web3: upgrade 6.3.0 -> 6.7.0
python3-aiohttp: upgrade 3.8.4 -> 3.8.5
python3-bitarray: upgrade 2.7.6 -> 2.8.0
python3-click: upgrade 8.1.5 -> 8.1.6
python3-cmake: upgrade 3.26.4 -> 3.27.0
python3-configargparse: upgrade 1.5.5 -> 1.7
python3-cytoolz: upgrade 0.12.1 -> 0.12.2
python3-dnspython: upgrade 2.4.0 -> 2.4.1
python3-elementpath: upgrade 4.1.4 -> 4.1.5
python3-flask-socketio: upgrade 5.3.4 -> 5.3.5
python3-gnupg: upgrade 0.5.0 -> 0.5.1
python3-google-api-python-client: upgrade 2.93.0 -> 2.95.0
python3-grpcio: upgrade 1.56.0 -> 1.56.2
python3-jedi: upgrade 0.18.2 -> 0.19.0
python3-marshmallow: upgrade 3.19.0 -> 3.20.1
python3-portion: upgrade 2.4.0 -> 2.4.1
python3-pymodbus: upgrade 3.3.2 -> 3.4.1
python3-robotframework: upgrade 6.1 -> 6.1.1
python3-tomlkit: upgrade 0.11.8 -> 0.12.1
python3-typeguard: upgrade 4.0.0 -> 4.1.0
python3-virtualenv: upgrade 20.24.0 -> 20.24.2
python3-zeroconf: upgrade 0.71.0 -> 0.71.4
rdma-core: upgrade 46.0 -> 47.0
sip: upgrade 6.7.9 -> 6.7.10
Willy Tu (1):
mstpd: Add initial recipe for mstpd
Yi Zhao (4):
samba: upgrade 4.18.4 -> 4.18.5
libnfnetlink: enable native build
libnetfilter-queue: enable native build
daq: enable nfq module build
meta-raspberrypi: e3f733cadd..5e2f79a6fa:
Jan Vermaete (2):
kas-poky-rpi.yml: renamed ABORT to HALT
rpi-base.inc: add the disable-wifi overlay
Khem Raj (1):
rpi-base: Remove customizing SPLASH var
Martin Jansa (1):
libcamera: update PACKAGECONFIG for libcamera-0.1.0
Vincent Davis Jr (1):
rpidistro-vlc: fix error uint64_t does not name
Vivien Didelot (10):
rpi-libcamera-apps: fix Illegal Instruction
rpi-libcamera-apps: add opencv build dependency
rpi-libcamera-apps: add drm support
rpi-libcamera-apps: replace tensorflow config
rpi-libcamera-apps: don't force COMPATIBLE_MACHINE
rpi-libcamera-apps: rename to libcamera-apps
libcamera-apps: move recipe to dynamic-layers
libcamera-apps: bump to 3d9ac10
libcamera-apps: switch from CMake to meson
libcamera-apps: bump to latest main
meta-arm: b4d50a273d..992c07f7c0:
Abdellatif El Khlifi (2):
arm-bsp/trusted-firmware-a: corstone1000: psci: SMCCC_ARCH_FEATURES discovery through PSCI_FEATURES
arm-bsp/u-boot: corstone1000: upgrade to v2023.07
Adam Johnston (1):
arm-bsp/trusted-firmware-a: Reserve OP-TEE memory from NWd on N1SDP
Emekcan Aras (1):
arm-bsp/u-boot: corstone1000: increase the kernel size
Jon Mason (9):
CI: add defaults for get-binary-toolchains
CI: workaround 32bit timer warning in binary toolchain
arm-bsp/corstone1000: update u-boot preferred version
arm-toolchain/gcc-aarch64-none-elf: upgrade to 12.3.rel1
arm/edk2: move 202211 recipe to meta-arm-bsp
arm-bsp: clean-up patch noise
arm/optee-test: update musl workaround patch
arm-bsp/tc1: remove trusted-firmware-m target
arm/trusted-firmware-m: upgrade to v1.8.0
Robbie Cao (1):
arm/recipes-kernel: Add preempt-rt support for generic-arm64
Ross Burton (5):
arm-toolchain/androidclang: remove
arm-toolchain/arm-binary-toolchain: install to a versioned directory
arm-toolchain/gcc-arm-none-eabi-11.2: add new recipe
arm/trusted-firmware-m: explicitly use Arm GCC 11.2
arm-toolchain/gcc-arm-none-eabi: upgrade to 12.3.rel1
Ziad Elhanafy (1):
arm/recipes-devtools,doc: Update FVP version
poky: b398c7653e..71282bbc53:
Alex Kiernan (3):
base-passwd: Add the sgx group
udev: eudev: Revert add group to sgx
poky/poky-tiny: Explicitly exclude `shadow`
Alexander Kanavin (25):
meta: add missing summaries for image recipes
insane.bbclass: add do_recipe_qa task
devtool: do not run recipe_qa task when extracting source
insane.bbclass: add a SUMMARY/HOMEPAGE check (oe-core recipes only)
insane.bbclass: add a RECIPE_MAINTAINER check (oe-core recipes only)
librsvg: fix upstream version check
acpica: tarball and homepage relocated to intel.com
gnu-efi: upgrade 3.0.15 -> 3.0.17
gettext-minimal-native: obtain the needed files directly from gettext source tarball
kbd: upgrade 2.6.0 -> 2.6.1
systemd: upgrade 253.3 -> 253.7
jquery: upgrade 3.6.3 -> 3.7.0
strace: upgrade 6.3 -> 6.4
sudo: update 1.9.13p3 -> 1.9.14p2
libadwaita: add recipe from meta-gnome
epiphany: upgrade 43.1 -> 44.5
glibc-locale: use stricter matching for metapackages' runtime dependencies
uninative-tarball: install the full set of gconv modules
buildtools-extended-tarball: install the full set of gconv modules
procps: address failure with gettext 0.22
util-linux: upgrade 2.38.1 -> 2.39.1
ref-manual: document image-specific variant of INCOMPATIBLE_LICENSE
devtool/upgrade: raise an error if extracting source produces more than one directory
scripts/lib/scriptutils.py: add recipe_qa artifacts to exclusion list in filter_src_subdirs()
curl: ensure all ptest failures are caught
Alexandre Belloni (2):
base-files: bump PR because conf files are now sorted
wic: bootimg-efi: Stop hardcoding VMA offsets
Alexis Lothoré (3):
scripts/resulttool: add mention about new detected tests
scripts/resulttool: allow to replace test raw status with custom string
scripts/resulttool: define custom string for "not found" test results
Andrej Valek (2):
maintainers.inc: Modify email address
ref-manual: document CVE_STATUS and CVE_CHECK_STATUSMAP
Anuj Mittal (4):
glibc/check-test-wrapper: don't emit warnings from ssh
selftest/cases/glibc.py: increase the memory for testing
oeqa/utils/nfs: allow requesting non-udp ports
selftest/cases/glibc.py: switch to using NFS over TCP
BELOUARGA Mohamed (3):
linux-firmware : Add firmware of RTL8822 serie
bitbake: bitbake: fetch2/npmsw: Check if there are dependencies before trying to fetch them
bitbake: fetch2: Check if path is 'None' before calculating checksums
Bruce Ashfield (11):
kernel: make LOCALVERSION consistent between recipes
linux-yocto/6.4: fix CONFIG_LEDS_TRIGGER_GPIO kernel audit warning
linux-yocto/6.4: update to v6.4.6
linux-yocto/6.1: update to v6.1.41
linux-yocto/6.4: update to v6.4.7
linux-yocto-dev: bump to v6.5+
linux-yocto/6.4: update to v6.4.8
linux-yocto/6.1: update to v6.1.43
linux-yocto/6.4: update to v6.4.9
linux-yocto/6.4: fix qemuarm boot failure
linux-yocto-tiny/6.4: fix HID configuration warning
Chen Qi (4):
ncurses: fix CVE-2023-29491
multilib.conf: explicitly make MULTILIB_VARIANTS vardeps on MULTILIBS
gcc-crosssdk: ignore MULTILIB_VARIANTS in signature computation
openssh: sync with upstream's default
Christopher Larson (6):
bitbake: tests.data: add test for inline python calling a def'd function
bitbake: tests.codeparser: add test for exec of builtin from inline python
bitbake: data_smart: check for python builtins directly for context lookup
bitbake: tests.data: add test for builtin preferred over metadata value
bitbake: data_smart: directly check for methodpool functions in context lookup
bitbake: bb.tests.data: don't require the func flag for context functions
Denis OSTERLAND-HEIM (1):
kernel-fitImage: add machine compatible to config section
Dit Kozmaj (1):
bitbake: fetch2: Set maxsplit to match expected variables
Dmitry Baryshkov (5):
kmscube: bump SRCREV to get offscreen rendering to work
linux-firmware: package firmare for Dragonboard 410c
mesa: simplify overriding GALLIUMDRIVERS_LLVM
mesa: enable swrast Vulkan driver if LLVM drivers are enabled
linux-firmware: split platform-specific Adreno shaders to separate packages
Frederic Martinsons (4):
ptest-cargo.bbclass: Support of cargo workspaces
cargo.bbclass: Use --frozen flag for cargo operations
cargo_common.bbclass: Handle Cargo.lock modifications for git dependencies
rust-hello-world: Drop recipe
Jean-Marie Lemetayer (1):
package: always sort the conffiles
Joel Stanley (1):
kernel: don't fail if Modules.symvers doesn't exist
Jose Quaresma (1):
systemd: fix efi stubs
Joshua Watt (1):
bitbake: contrib: vim: Fix up a few errors when reloading
Julien Stephan (1):
libexif: add ptest support
Khem Raj (16):
nfs-utils: Fix host path contamination building locktest
ltp: Use bfd linker when lld is distro linker default
ffmpeg: Use bfd linker on i386 when lld is distro linker default
ltp: Use bfd linker for KVM_LD as well when ld-is-lld
autoconf: Backport upstreamed patches
Revert "site: merged common-glibc from OE"
x32-linux: Do not cache ac_cv_sys_file_offset_bits
gcc: Upgrade to 13.2 release
gnu-efi: Fix build break on riscv64
ffmpeg: Fix wrong code found with gas/2.41
systemd: Point to target binary paths for loadkeys and setfont
systemd: Make 254 work on musl
musl: Upgrade to tip of trunk
binutils: Upgrade to 2.41 release
systemd-boot: Ensure EFI_LD is also passed to compiler driver
pm-utils: Do not require GNU grep at runtime
Lee Chee Yang (2):
migration-guides: add release notes for 4.0.11
migration-guides: add release notes for 4.2.2
Luca Boccassi (2):
systemd: update to v254
systemd: add usrmerge to REQUIRED_DISTRO_FEATURES
Marek Vasut (1):
linux-firmware: Fix mediatek mt7601u firmware path
Mark Hatle (1):
tcf-agent: Update to 1.8.0 release
Markus Volk (4):
gcr3: remove recipe
systemd: add a packageconfig to support colored logs
webkitgtk: upgrade 2.40.2 -> 2.40.5
epiphany: upgrade 44.5 -> 44.6
Martin Jansa (3):
patchelf: add 3 fixes to optimize and fix uninative
alsa-utils: backport a fix to build with glibc-2.38
efivar: drop -fuse-ld=bfd
Michael Halstead (1):
yocto-uninative: Update hashes for uninative 4.1
Michael Opdenacker (4):
ref-manual: releases.svg: updates
ref-manual: LTS releases now supported for 4 years
poky.conf: update SANITY_TESTED_DISTROS to match autobuilder
recipes: remove unused AUTHOR variable
Oleksandr Hnatiuk (2):
file: return wrapper to fix builds when file is in buildtools-tarball
file: fix the way path is written to environment-setup.d
Ovidiu Panait (2):
mdadm: add util-linux-blockdev ptest dependency
mdadm: save ptest logs
Peter Marko (4):
cve-extra-exclusions: fix syntax error
libarchive: ignore CVE-2023-30571
cve-exclusion_6.1: correct typo in exclusion list name
bluez5: correct CVE status of ignored CVEs
Peter Suti (1):
externalsrc: fix dependency chain issues
Quentin Schulz (1):
docs: sdk-manual: appendix-obtain: fix literal block content
Richard Purdie (21):
createrepo-c: Fix 32 bit architecture segfaults with 64 bit time
build-appliance-image: Update to master head revision
oeqa/target/ssh: Ensure EAGAIN doesn't truncate output
createrepo-c: Update patch status
oeqa/runtime/ltp: Increase ltp test output timeout
oeqa/ltp: Show warning for non-zero exit codes
ltp: Add kernel loopback module dependency
target/ssh: Ensure exit code set for commands
autoconf: Upgrade to 2.72c
oeqa/ssh: Further improve process exit handling
oeqa/selftest/rust: Round test execution time to integer
qemuboot/runqemu: Fix 6.2 and later kernel network device naming
bitbake: siggen: Improve runtaskdeps data to fix sstate debugging
sstatesig: Update to match bitbake changes to runtaskdeps
Revert "kea: upgrade to v2.5.0"
selftest/reproducible: Update config to match ongoing changes
gnupg: Fix reproducibility failure
selftest: Ensure usrmerge is enabled with systemd
conf/init-mamager-systemd: Add usrmerge to DISTRO_FEATURES
bitbake.conf: Drop PE and PR from WORKDIR and STAMP
qemuboot: Update hardcoded path to match new layout
Robert Joslyn (2):
curl: Update from 8.1.2 to 8.2.0
curl: Refine ptest perl RDEPENDS
Ross Burton (8):
systemd: set correct paths for kdb binaries
systemd: depend on util-linux's swapon/off
linux-yocto: add script to generate kernel CVE_STATUS entries
ghostscript: backport fix for CVE-2023-38559
ghostscript: ignore CVE-2023-38560
openssh: upgrade to 9.3p2
librsvg: upgrade to 2.56.3
linux-yocto: extract generic kernel CVE_STATUS
Sakib Sajal (1):
go: upgrade 1.20.6 -> 1.20.7
Sudip Mukherjee (3):
libgit2: upgrade to v1.7.0
bind: upgrade to v9.18.17
kea: upgrade to v2.5.0
Tim Orling (10):
python3-urllib3: upgrade 2.0.3 -> 2.0.4
python3-hypothesis: upgrade 6.81.2 -> 6.82.0
python3-pyyaml: upgrade 6.0 -> 6.0.1
python_setuptools3_rust: inherit ...build_meta
python3-sphinx: upgrade 7.0.1 -> 7.1.1
python3-certifi: upgrade 2023.5.7 -> 2023.7.22
python3-more-itertools: upgrade 9.1.0 -> 10.0.0
python3-wheel: upgrade 0.40.0 -> 0.41.0
python3-chardet: upgrade 5.1.0 -> 5.2.0
python3-cryptography{-vectors}: upgrade -> 41.0.3
Trevor Gamblin (7):
python3-dtschema: upgrade 2023.4 -> 2023.6.1
python3-dtc: add from meta-virtualization
python3-dtschema: add python3-dtc to RDEPENDS
nfs-utils: upgrade 2.6.2 -> 2.6.3
iproute2: upgrade 6.3.0 -> 6.4.0
git: upgrade 2.39.3 -> 2.41.0
python3: add additional timing-related test skips
Ulrich Ölmann (3):
ref-manual: classes: kernel-fitimage: fix source of imagetype
ref-manual: classes: kernel-fitimage: fix typos
ref-manual: classes: kernel-fitimage: refine role of INITRAMFS_IMAGE_BUNDLE
Yang Xu (2):
oeqa/selftest/ssate: Add test for find_siginfo
bitbake: server/process: fix sig handle
Yash Shinde (5):
rust: Fix BOOTSTRAP_CARGO failure during Rust Oe-selftest
oeqa/selftest/rust: Add failed test cases to exclude list for Rust Oe-selftest
oeqa/selftest/binutils: Add elapsed time for binutils test report.
oeqa/selftest/gcc: Add elapsed time for gcc test report.
oeqa/selftest/glibc: Add elapsed time for glibc test report.
Yoann Congal (1):
bitbake: fetch2/gitsm: Document that we won't support propagating user parameter
meta-security: 405cca4028..b9bc938785:
Armin Kuster (21):
bastille: bastille/config should not be world writeable.
ossec-hids: Fix usermod
python3-flask-script: add package
python3-segno: add new package
python3-privacyidea: fixup REDPENDS
qemu: move qemu setting to image and out of layer.conf
packagegroup-core-security: only include firejail x86-64 and arch64
firejail: only allow x86-64 and arm64 to build
python3-tpm2-pytss: add python tss2 support
packagegroup: add python3-tpm2-pytss
clamav: update SRC_URI
scap-security-guide: refactor patches
packagegroup-security-tpm2: add more pkgs
scap-security-guide: enable ptest
python3-yamlpath: Add new pkg
python3-json2html: add new pkg
python3-json2html: add new pkg
meta-integrity: drop ima.cfg in favor of new k-cache
sshguard: Update to 2.4.3
meta-tpm linux-yocto-rt: Add the bbappend for rt kernel
layer: add QA_WARNINGS to all layers
Kai Kang (2):
openscap: fix buildpaths issue
sssd: 2.7.4 -> 2.9.1
Kevin Hao (1):
linux-yocto-rt: Add the bbappend for rt kernel
Luke Granger-Brown (1):
glome: update to tip
Wurm, Stephan (1):
dm-verity-image-initramfs: Allow compressed image types
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Icf1ba0c270d53f4c3c3838d4305116e5d6f794de
Diffstat (limited to 'poky/meta/recipes-devtools')
133 files changed, 5393 insertions, 5746 deletions
diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/0001-Port-to-compilers-that-moan-about-K-R-func-decls.patch b/poky/meta/recipes-devtools/autoconf/autoconf/0001-Port-to-compilers-that-moan-about-K-R-func-decls.patch deleted file mode 100644 index 4f15bf96c3..0000000000 --- a/poky/meta/recipes-devtools/autoconf/autoconf/0001-Port-to-compilers-that-moan-about-K-R-func-decls.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 7a3bbca81b803ba116b83c82de378e840cc35f81 Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Thu, 1 Sep 2022 16:19:50 -0500 -Subject: [PATCH] Port to compilers that moan about K&R func decls -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* lib/autoconf/c.m4 (AC_LANG_CALL, AC_LANG_FUNC_LINK_TRY): -Use '(void)' rather than '()' in function prototypes, as the latter -provokes fatal errors in some compilers nowadays. -* lib/autoconf/functions.m4 (AC_FUNC_STRTOD): -* tests/fortran.at (AC_F77_DUMMY_MAIN usage): -* tests/semantics.at (AC_CHECK_DECLS): -Don’t use () in a function decl. - -Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=8b5e2016c7ed2d67f31b03a3d2e361858ff5299b] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - doc/autoconf.texi | 7 +++---- - lib/autoconf/c.m4 | 6 +++--- - lib/autoconf/functions.m4 | 3 --- - tests/fortran.at | 8 ++++---- - tests/semantics.at | 2 +- - 5 files changed, 11 insertions(+), 15 deletions(-) - ---- a/doc/autoconf.texi -+++ b/doc/autoconf.texi -@@ -5465,9 +5465,7 @@ the @samp{#undef malloc}): - #include <config.h> - #undef malloc - --#include <sys/types.h> -- --void *malloc (); -+#include <stdlib.h> - - /* Allocate an N-byte block of memory from the heap. - If N is zero, allocate a 1-byte block. */ -@@ -8295,7 +8293,7 @@ needed: - # ifdef __cplusplus - extern "C" - # endif -- int F77_DUMMY_MAIN () @{ return 1; @} -+ int F77_DUMMY_MAIN (void) @{ return 1; @} - #endif - @end example - ---- a/lib/autoconf/c.m4 -+++ b/lib/autoconf/c.m4 -@@ -127,7 +127,7 @@ m4_if([$2], [main], , - [/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ --char $2 ();])], [return $2 ();])]) -+char $2 (void);])], [return $2 ();])]) - - - # AC_LANG_FUNC_LINK_TRY(C)(FUNCTION) -@@ -151,7 +151,7 @@ m4_define([AC_LANG_FUNC_LINK_TRY(C)], - #define $1 innocuous_$1 - - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $1 (); below. */ -+ which can conflict with char $1 (void); below. */ - - #include <limits.h> - #undef $1 -@@ -162,7 +162,7 @@ m4_define([AC_LANG_FUNC_LINK_TRY(C)], - #ifdef __cplusplus - extern "C" - #endif --char $1 (); -+char $1 (void); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ ---- a/lib/autoconf/functions.m4 -+++ b/lib/autoconf/functions.m4 -@@ -1601,9 +1601,6 @@ AC_DEFUN([AC_FUNC_STRTOD], - AC_CACHE_CHECK(for working strtod, ac_cv_func_strtod, - [AC_RUN_IFELSE([AC_LANG_SOURCE([[ - ]AC_INCLUDES_DEFAULT[ --#ifndef strtod --double strtod (); --#endif - int - main (void) - { ---- a/tests/fortran.at -+++ b/tests/fortran.at -@@ -233,7 +233,7 @@ void FOOBAR_F77 (double *x, double *y); - # ifdef __cplusplus - extern "C" - # endif -- int F77_DUMMY_MAIN () { return 1; } -+ int F77_DUMMY_MAIN (void) { return 1; } - #endif - - int main(int argc, char *argv[]) -@@ -315,7 +315,7 @@ void FOOBAR_FC(double *x, double *y); - # ifdef __cplusplus - extern "C" - # endif -- int FC_DUMMY_MAIN () { return 1; } -+ int FC_DUMMY_MAIN (void) { return 1; } - #endif - - int main (int argc, char *argv[]) -@@ -561,7 +561,7 @@ void @foobar@ (int *x); - # ifdef __cplusplus - extern "C" - # endif -- int F77_DUMMY_MAIN () { return 1; } -+ int F77_DUMMY_MAIN (void) { return 1; } - #endif - - int main(int argc, char *argv[]) -@@ -637,7 +637,7 @@ void @foobar@ (int *x); - # ifdef __cplusplus - extern "C" - # endif -- int FC_DUMMY_MAIN () { return 1; } -+ int FC_DUMMY_MAIN (void) { return 1; } - #endif - - int main(int argc, char *argv[]) ---- a/tests/semantics.at -+++ b/tests/semantics.at -@@ -207,7 +207,7 @@ AT_CHECK_MACRO([AC_CHECK_DECLS], - [[extern int yes; - enum { myenum }; - extern struct mystruct_s { int x[20]; } mystruct; -- extern int myfunc(); -+ extern int myfunc (int); - #define mymacro1(arg) arg - #define mymacro2]]) - # Ensure we can detect missing declarations of functions whose diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0001-mention-prototypes-more-prominently-in-NEWS.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0001-mention-prototypes-more-prominently-in-NEWS.patch new file mode 100644 index 0000000000..3faf6f0a81 --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0001-mention-prototypes-more-prominently-in-NEWS.patch @@ -0,0 +1,36 @@ +From 5ffc09fca39de051537fbebd7c6c33d5255a520f Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Mon, 27 Mar 2023 18:10:36 -0700 +Subject: [PATCH 01/29] mention prototypes more prominently in NEWS + +* NEWS: Mention the function prototype issue early. +(From a suggestion by Zack Weinberg.) + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + NEWS | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/NEWS b/NEWS +index cf01ee210..d64648c6f 100644 +--- a/NEWS ++++ b/NEWS +@@ -4,6 +4,14 @@ GNU Autoconf NEWS - User visible changes. + + ** Backward incompatibilities + ++*** AC_CHECK_FUNC and similar macros now use function prototypes. ++ AC_CHECK_FUNC and and similar macros now use C declarations with ++ function prototypes, a feature introduced in C89. The new approach ++ should work better with C23, which removed the non-prototyped K&R ++ style that AC_CHECK_FUNC previously used. However, this change ++ means Autoconf no longer supports pre-1989 C compilers, as they do ++ not support function prototypes. ++ + *** Autoconf now requires perl 5.10 (2007) or later. + Generated 'configure' scripts continue to run without perl. + +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0002-build-run-make-fetch-which-updated-these.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0002-build-run-make-fetch-which-updated-these.patch new file mode 100644 index 0000000000..35f324c4ae --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0002-build-run-make-fetch-which-updated-these.patch @@ -0,0 +1,123 @@ +From e2220ed33e69d8bc6504e3f6279894afe33a99a5 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Wed, 29 Mar 2023 12:59:09 -0700 +Subject: [PATCH 02/29] build: run "make fetch", which updated these: + +* build-aux/texinfo.tex: Update from texinfo. +* lib/Autom4te/FileUtils.pm: Update from automake. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + build-aux/texinfo.tex | 50 +++++++++++++++++++++------------------ + lib/Autom4te/FileUtils.pm | 5 +++- + 2 files changed, 31 insertions(+), 24 deletions(-) + +diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex +index d25161109..55a002d27 100644 +--- a/build-aux/texinfo.tex ++++ b/build-aux/texinfo.tex +@@ -3,7 +3,7 @@ + % Load plain if necessary, i.e., if running under initex. + \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi + % +-\def\texinfoversion{2023-03-21.06} ++\def\texinfoversion{2023-03-27.21} + % + % Copyright 1985, 1986, 1988, 1990-2023 Free Software Foundation, Inc. + % +@@ -1102,27 +1102,33 @@ where each line of input produces a line of output.} + + % Output page labels information. + % See PDF reference v.1.7 p.594, section 8.3.1. ++% Page label ranges must be increasing. + \ifpdf + \def\pagelabels{% + \def\title{0 << /P (T-) /S /D >>}% +- \edef\roman{\the\romancount << /S /r >>}% +- \edef\arabic{\the\arabiccount << /S /D >>}% + % +- % Page label ranges must be increasing. Remove any duplicates. +- % (There is a slight chance of this being wrong if e.g. there is +- % a @contents but no @titlepage, etc.) +- % +- \ifnum\romancount=0 \def\roman{}\fi +- \ifnum\arabiccount=0 \def\title{}% +- \else +- \ifnum\romancount=\arabiccount \def\roman{}\fi +- \fi +- % +- \ifnum\romancount<\arabiccount +- \pdfcatalog{/PageLabels << /Nums [\title \roman \arabic ] >> }\relax ++ % support @contents at very end of document ++ \ifnum\contentsendcount=\pagecount ++ \ifnum\arabiccount<\romancount ++ \pdfcatalog{/PageLabels << /Nums ++ [\title ++ \the\arabiccount << /S /D >> ++ \the\romancount << /S /r >> ++ ] >> }\relax ++ \fi ++ % no contents in document ++ \else\ifnum\contentsendcount=0 ++ \pdfcatalog{/PageLabels << /Nums ++ [\title ++ \the\arabiccount << /S /D >> ++ ] >> }\relax + \else +- \pdfcatalog{/PageLabels << /Nums [\title \arabic \roman ] >> }\relax +- \fi ++ \pdfcatalog{/PageLabels << /Nums ++ [\title ++ \the\romancount << /S /r >> ++ \the\contentsendcount << /S /D >> ++ ] >> }\relax ++ \fi\fi + } + \else + \let\pagelabels\relax +@@ -1131,6 +1137,8 @@ where each line of input produces a line of output.} + \newcount\pagecount \pagecount=0 + \newcount\romancount \romancount=0 + \newcount\arabiccount \arabiccount=0 ++\newcount\contentsendcount \contentsendcount=0 ++ + \ifpdf + \let\ptxadvancepageno\advancepageno + \def\advancepageno{% +@@ -6809,12 +6817,8 @@ might help (with 'rm \jobname.?? \jobname.??s')% + % Get ready to use Arabic numerals again + \def\contentsendroman{% + \lastnegativepageno = \pageno +- \global\pageno = \savepageno +- % +- % If \romancount > \arabiccount, the contents are at the end of the +- % document. Otherwise, advance where the Arabic numerals start for +- % the page numbers. +- \ifnum\romancount>\arabiccount\else\global\arabiccount=\pagecount\fi ++ \global\pageno=1 ++ \contentsendcount = \pagecount + } + + % Typeset the label for a chapter or appendix for the short contents. +diff --git a/lib/Autom4te/FileUtils.pm b/lib/Autom4te/FileUtils.pm +index ab58b9de4..2468fe6d8 100644 +--- a/lib/Autom4te/FileUtils.pm ++++ b/lib/Autom4te/FileUtils.pm +@@ -39,9 +39,12 @@ use strict; + use warnings FATAL => 'all'; + + use Exporter; +-use Time::HiRes qw(stat); + use IO::File; + ++# use sub-second resolution timestamps if available, ++# carry on with one-second resolution timestamps if that is all we have ++BEGIN { eval { require Time::HiRes; import Time::HiRes qw(stat) } } ++ + use Autom4te::Channels; + use Autom4te::ChannelDefs; + +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0003-NEWS-Tighten-up-wording.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0003-NEWS-Tighten-up-wording.patch new file mode 100644 index 0000000000..76c37a005b --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0003-NEWS-Tighten-up-wording.patch @@ -0,0 +1,29 @@ +From e05aa447945c0d72ad924fd89a28830cf1a0f8d3 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Fri, 31 Mar 2023 10:37:57 -0700 +Subject: [PATCH 03/29] * NEWS: Tighten up wording. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + NEWS | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/NEWS b/NEWS +index d64648c6f..884e46f45 100644 +--- a/NEWS ++++ b/NEWS +@@ -5,9 +5,7 @@ GNU Autoconf NEWS - User visible changes. + ** Backward incompatibilities + + *** AC_CHECK_FUNC and similar macros now use function prototypes. +- AC_CHECK_FUNC and and similar macros now use C declarations with +- function prototypes, a feature introduced in C89. The new approach +- should work better with C23, which removed the non-prototyped K&R ++ This should work better with C23, which removed the non-prototyped K&R + style that AC_CHECK_FUNC previously used. However, this change + means Autoconf no longer supports pre-1989 C compilers, as they do + not support function prototypes. +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0004-Cater-to-programs-misusing-AC_EGREP_HEADER.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0004-Cater-to-programs-misusing-AC_EGREP_HEADER.patch new file mode 100644 index 0000000000..1b30d9926c --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0004-Cater-to-programs-misusing-AC_EGREP_HEADER.patch @@ -0,0 +1,82 @@ +From 232cab527897bcdf4d55492d41af73d31905bda5 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Fri, 31 Mar 2023 10:46:20 -0700 +Subject: [PATCH 04/29] Cater to programs misusing AC_EGREP_HEADER +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Frederic Berat in: +https://lists.gnu.org/archive/html/autoconf/2022-11/msg00127.html +* lib/autoconf/programs.m4 (AC_PROG_EGREP): Also set +EGREP_TRADITIONAL and ac_cv_path_EGREP_TRADITIONAL. +* tests/c.at (AC_PROG_EGREP and AC_EGREP_HEADER): +New test, taken from Frederic Berat’s email in: +https://lists.gnu.org/r/autoconf/2023-03/msg00043.html + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/autoconf/programs.m4 | 10 ++++++++++ + tests/c.at | 24 ++++++++++++++++++++++++ + 2 files changed, 34 insertions(+) + +diff --git a/lib/autoconf/programs.m4 b/lib/autoconf/programs.m4 +index 1b7460c85..62ba6b8b6 100644 +--- a/lib/autoconf/programs.m4 ++++ b/lib/autoconf/programs.m4 +@@ -371,6 +371,16 @@ AC_CACHE_CHECK([for egrep], ac_cv_path_EGREP, + fi]) + EGREP="$ac_cv_path_EGREP" + AC_SUBST([EGREP]) ++ dnl ++ dnl Also set EGREP_TRADITIONAL even though unnecessary here, ++ dnl for wrong but too-common code with the following pattern: ++ dnl AC_PROG_EGREP ++ dnl if false; then ++ dnl AC_EGREP_HEADER([printf], [stdio.h], [has_printf=yes]) ++ dnl fi ++ dnl AC_EGREP_HEADER([malloc], [stdlib.h], [has_malloc=yes]) ++ EGREP_TRADITIONAL=$EGREP ++ ac_cv_path_EGREP_TRADITIONAL=$EGREP + ])# AC_PROG_EGREP + + # _AC_PROG_EGREP_TRADITIONAL +diff --git a/tests/c.at b/tests/c.at +index c37f43b10..fad54760f 100644 +--- a/tests/c.at ++++ b/tests/c.at +@@ -232,6 +232,30 @@ AT_CHECK_DEFINES( + AT_CLEANUP + + ++## ----------------------------------- ## ++## AC_PROG_EGREP and AC_EGREP_HEADER. ## ++## ----------------------------------- ## ++ ++AT_SETUP([AC_PROG_EGREP and AC_EGREP_HEADER]) ++ ++_AT_CHECK_AC_MACRO( ++[[AC_PROG_CPP ++ AC_PROG_EGREP ++ ++ # Although this code is incorrect (it should use AS_IF), ++ # it follows a too-common real world pattern. ++ # For now, test for it; we may remove this test later. ++ if false; then ++ AC_EGREP_HEADER([^], [limits.h]) ++ fi ++ ++ AC_EGREP_HEADER([$], [limits.h], [], ++ [AC_MSG_ERROR([[egrep-related macros do not tolerate misuse of 'if']])]) ++]]) ++ ++AT_CLEANUP ++ ++ + ## ------------------------------------ ## + ## AC_NO_EXECUTABLES (working linker). ## + ## ------------------------------------ ## +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0006-Fix-timing-bug-on-high-speed-builds.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0006-Fix-timing-bug-on-high-speed-builds.patch new file mode 100644 index 0000000000..53fb40b4df --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0006-Fix-timing-bug-on-high-speed-builds.patch @@ -0,0 +1,75 @@ +From 713d9822bbfb2923115065efaefed34a0113f8a1 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Sat, 1 Apr 2023 16:44:03 -0700 +Subject: [PATCH 06/29] Fix timing bug on high-speed builds +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Bogdan via Jacob Bachmeyer in: +https://lists.gnu.org/r/autoconf/2023-04/msg00002.html +* bin/autom4te.in: If a file timestamp equals a dependency’s +timestamp, consider the file to be out of date. Although this may +result in extra work, it fixes some rare timing bugs. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + bin/autom4te.in | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/bin/autom4te.in b/bin/autom4te.in +index 4b61f0a82..71d7e6a62 100644 +--- a/bin/autom4te.in ++++ b/bin/autom4te.in +@@ -910,10 +910,8 @@ sub up_to_date ($) + return 0 + if ! -f $tfile || ! -f $ofile; + +- # The youngest of the cache files must be older than the oldest of ++ # The younger of the cache files must be older than the oldest of + # the dependencies. +- # FIXME: These timestamps have only 1-second resolution. +- # Time::HiRes fixes this, but assumes Perl 5.8 or later. + my $tmtime = mtime ($tfile); + my $omtime = mtime ($ofile); + my ($file, $mtime) = ($tmtime < $omtime +@@ -926,7 +924,7 @@ sub up_to_date ($) + # We depend at least upon the arguments. + foreach my $dep (@ARGV) + { +- if ($mtime < mtime ($dep)) ++ if ($mtime <= mtime ($dep)) + { + verb "up_to_date ($file): outdated: $dep"; + return 0; +@@ -949,7 +947,7 @@ sub up_to_date ($) + # timestamp of that missing file was newer). + return 0 + if ! $dep; +- if ($mtime < mtime ($dep)) ++ if ($mtime <= mtime ($dep)) + { + verb "up_to_date ($file): outdated: $dep"; + return 0; +@@ -1038,7 +1036,7 @@ $icache_file = new Autom4te::XFile $icache, O_RDWR|O_CREAT; + $icache_file->lock (LOCK_EX) + if ($flock_implemented eq "yes"); + +-# Read the cache index if available and older than autom4te itself. ++# Read the cache index if available and younger than autom4te itself. + # If autom4te is younger, then some structures such as C4che might + # have changed, which would corrupt its processing. + Autom4te::C4che->load ($icache_file) +@@ -1105,7 +1103,7 @@ else + # Actual M4 expansion, if the user wants it, or if $output is old + # (STDOUT is pretty old). + handle_output ($req, $output) +- if $force || mtime ($output) < mtime ($ocache . $req->id); ++ if $force || mtime ($output) <= mtime ($ocache . $req->id); + } + + # If we ran up to here, the cache is valid. +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0007-Support-underquoted-callers-better.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0007-Support-underquoted-callers-better.patch new file mode 100644 index 0000000000..f9f9345ade --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0007-Support-underquoted-callers-better.patch @@ -0,0 +1,57 @@ +From 794182506c3c5814d48b2fc4d832770f608ce0ef Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Sat, 1 Apr 2023 20:25:13 -0700 +Subject: [PATCH 07/29] Support underquoted callers better +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported bh Khem Raj for mcpp 2.7.2 (2008) in: +https://lists.gnu.org/r/autoconf/2023-04/msg00001.html +* lib/autoconf/programs.m4 (_AC_PATH_PROG_FLAVOR_GNU): +Add two ‘@%:@(’s to cater to underquoted callers. +* lib/m4sugar/m4sh.m4 (_AS_PATH_WALK): Use quadrigraph instead of +‘#’, for underquoted callers. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/autoconf/programs.m4 | 5 +++-- + lib/m4sugar/m4sh.m4 | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/lib/autoconf/programs.m4 b/lib/autoconf/programs.m4 +index 62ba6b8b6..d06d18c44 100644 +--- a/lib/autoconf/programs.m4 ++++ b/lib/autoconf/programs.m4 +@@ -543,11 +543,12 @@ dnl # for best performing tool in a list breaks down. + # ---------------------------------------------------------------- + m4_define([_AC_PATH_PROG_FLAVOR_GNU], + [# Check for GNU $1 +-case `"$1" --version 2>&1` in ++case `"$1" --version 2>&1` in @%:@( + *GNU*) + $2;; + m4_ifval([$3], +-[*) ++[@%:@( ++*) + $3;; + ])esac + ])# _AC_PATH_PROG_FLAVOR_GNU +diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4 +index ab5ca7db7..368487fa0 100644 +--- a/lib/m4sugar/m4sh.m4 ++++ b/lib/m4sugar/m4sh.m4 +@@ -1389,7 +1389,7 @@ m4_if([$1], m4_translit([[$1]], [:;]), + for as_dir in $as_dummy]) + do + IFS=$as_save_IFS +- case $as_dir in #((( ++ case $as_dir in @%:@((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0008-New-script-for-building-inside-Guix-containers.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0008-New-script-for-building-inside-Guix-containers.patch new file mode 100644 index 0000000000..cec7dcddef --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0008-New-script-for-building-inside-Guix-containers.patch @@ -0,0 +1,54 @@ +From 8babe5f2ccb73cc574933743b381557a4db02424 Mon Sep 17 00:00:00 2001 +From: Zack Weinberg <zackw@panix.com> +Date: Thu, 30 Mar 2023 10:50:36 -0400 +Subject: [PATCH 08/29] New script for building inside Guix containers. + +build-aux/test-build-guix, goes with the top level manifest.scm. +See the top of the file for usage instructions. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + build-aux/test-build-guix | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) + create mode 100755 build-aux/test-build-guix + +diff --git a/build-aux/test-build-guix b/build-aux/test-build-guix +new file mode 100755 +index 000000000..4470af9b7 +--- /dev/null ++++ b/build-aux/test-build-guix +@@ -0,0 +1,30 @@ ++#! /bin/sh ++ ++# From a pristine Git checkout, run ++# guix shell --container --manifest=manifest.scm -- build-aux/test-build-guix ++# to perform a complete bootstrap and test build of Autoconf. ++ ++set -ex ++ ++# Guix bug? /bin/sh is usually *not* the shell specified in the manifest. ++SHELL="$(command -v sh)" ++export SHELL ++if [ "$(realpath /bin/sh)" != "$(realpath "$SHELL")" ]; then ++ ( ++ cd /bin ++ rm sh ++ ln -s "$SHELL" sh ++ ) ++ exec "$SHELL" "$0" "$@" ++fi ++ ++./bootstrap ++if [ -d _build ]; then ++ rm -rf _build/* ++else ++ mkdir _build ++fi ++cd _build ++../configure ++make all info pdf dvi ++make distcheck +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0009-AC_XENIX_DIR-Rewrite-using-AC_CANONICAL_HOST.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0009-AC_XENIX_DIR-Rewrite-using-AC_CANONICAL_HOST.patch new file mode 100644 index 0000000000..c1c60dcf53 --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0009-AC_XENIX_DIR-Rewrite-using-AC_CANONICAL_HOST.patch @@ -0,0 +1,82 @@ +From dcf9bb7e3b12f3bd74edff60e80b53e668159579 Mon Sep 17 00:00:00 2001 +From: Zack Weinberg <zackw@panix.com> +Date: Sun, 2 Apr 2023 10:27:08 -0400 +Subject: [PATCH 09/29] AC_XENIX_DIR: Rewrite using AC_CANONICAL_HOST. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +AC_XENIX_DIR is an obsolete macro, defined as AC_HEADER_DIRENT plus +code to make absolutely sure configure scripts that depended on a +shell variable internal to the original (2.13 era) definition of +AC_XENIX_DIR are not broken by autoupdate. (That variable had the +temptingly public-sounding name “XENIX.”) This compatibility code +uses AC_EGREP_CPP, which is itself discouraged for use in new +configure scripts. + +(N.B. codesearch.debian.net does not find any uses whatsoever of +this macro, nor any code in an .ac or .m4 file that depends on the +XENIX variable.) + +Change the compatibility code to use AC_CANONICAL_HOST instead, +and clarify which pieces of the code inserted by autoupdate are +probably still necessary. + +* lib/autoconf/specific.m4 (AC_XENIX_DIR): Set XENIX variable + based on value of host_os. Clarify what manual cleanup is + recommended after autoupdate replaces this obsolete macro. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/autoconf/specific.m4 | 26 +++++++++++--------------- + 1 file changed, 11 insertions(+), 15 deletions(-) + +diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 +index 1b3ee661b..a2dc5d488 100644 +--- a/lib/autoconf/specific.m4 ++++ b/lib/autoconf/specific.m4 +@@ -754,9 +754,9 @@ dnl it should only be defined when necessary. + ## Checks for UNIX variants. ## + ## -------------------------- ## + +- +-# These are kludges which should be replaced by a single POSIX check. +-# They aren't cached, to discourage their use. ++# These macros are all obsolete, from the early days of Autoconf, ++# before the invention of AC_CANONICAL_SYSTEM. Autoupdate will ++# replace each with inline code for a more modern feature check. + + # AC_AIX + # ------ +@@ -776,19 +776,15 @@ AU_DEFUN([AC_ISC_POSIX], [AC_SEARCH_LIBS([strerror], [cposix])]) + # AC_XENIX_DIR + # ------------ + AU_DEFUN([AC_XENIX_DIR], +-[AC_MSG_CHECKING([for Xenix]) +-AC_EGREP_CPP([yes], +-[#if defined M_XENIX && ! defined M_UNIX +- yes +-@%:@endif], +- [AC_MSG_RESULT([yes]); XENIX=yes], +- [AC_MSG_RESULT([no]); XENIX=]) +- +-AC_HEADER_DIRENT[]dnl ++[AC_HEADER_DIRENT ++# Autoupdate added the next two lines to ensure that your configure ++# script's behavior did not change. They are safe to remove unless ++# you have code that depends on the XENIX shell variable. ++AC_CANONICAL_HOST ++AS_CASE([$host_os], [xenix*], [XENIX=yes], [XENIX=no]) ++# End of code added by autoupdate + ], +-[You shouldn't need to depend upon XENIX. Remove the +-'AC_MSG_CHECKING', 'AC_EGREP_CPP', and this warning if this part +-of the test is useless.]) ++[Check for code depending on the XENIX shell variable.]) + + + # AC_DYNIX_SEQ +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0010-AC_TYPE_UID_T-Rewrite-using-AC_CHECK_TYPE.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0010-AC_TYPE_UID_T-Rewrite-using-AC_CHECK_TYPE.patch new file mode 100644 index 0000000000..49322712ac --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0010-AC_TYPE_UID_T-Rewrite-using-AC_CHECK_TYPE.patch @@ -0,0 +1,77 @@ +From 51d98495d1aac00970d791f064e83ca762bf81c7 Mon Sep 17 00:00:00 2001 +From: Zack Weinberg <zackw@panix.com> +Date: Sun, 2 Apr 2023 10:43:51 -0400 +Subject: [PATCH 10/29] AC_TYPE_UID_T: Rewrite using AC_CHECK_TYPE. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +AC_TYPE_UID_T uses AC_EGREP_HEADER to search sys/types.h for +occurrences of the string ‘uid_t’ and, if found, assumes both +uid_t and gid_t are available. This would be better done using +a pair of AC_CHECK_TYPE operations. + +I also converted two uses of old-style AC_CHECK_TYPE, immediately +below, to new-style. (There are probably other old-style uses in +this file, I only did the ones I happened to see.) + +* lib/autoconf/types.m4 (AC_TYPE_UID_T): Check for uid_t and gid_t, + separately, using AC_CHECK_TYPE, instead of grepping sys/types.h. + (AC_TYPE_SIZE_T, AC_TYPE_SSIZE_T): Use new-style AC_CHECK_TYPE. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/autoconf/types.m4 | 30 +++++++++++++++++------------- + 1 file changed, 17 insertions(+), 13 deletions(-) + +diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4 +index ebac0cf6d..ef2456135 100644 +--- a/lib/autoconf/types.m4 ++++ b/lib/autoconf/types.m4 +@@ -589,25 +589,29 @@ AC_DEFUN([AC_TYPE_MBSTATE_T], + + # AC_TYPE_UID_T + # ------------- +-# FIXME: Rewrite using AC_CHECK_TYPE. + AN_IDENTIFIER([gid_t], [AC_TYPE_UID_T]) + AN_IDENTIFIER([uid_t], [AC_TYPE_UID_T]) + AC_DEFUN([AC_TYPE_UID_T], +-[AC_CACHE_CHECK(for uid_t in sys/types.h, ac_cv_type_uid_t, +-[AC_EGREP_HEADER(uid_t, sys/types.h, +- ac_cv_type_uid_t=yes, ac_cv_type_uid_t=no)]) +-if test $ac_cv_type_uid_t = no; then +- AC_DEFINE(uid_t, int, [Define to 'int' if <sys/types.h> doesn't define.]) +- AC_DEFINE(gid_t, int, [Define to 'int' if <sys/types.h> doesn't define.]) +-fi +-]) +- +- ++[AC_CHECK_TYPE([uid_t], [], ++ [AC_DEFINE([uid_t], [int], ++ [Define as 'int' if <sys/types.h> doesn't define.])]) ++AC_CHECK_TYPE([gid_t], [], ++ [AC_DEFINE([gid_t], [int], ++ [Define as 'int' if <sys/types.h> doesn't define.])])]) ++ ++# This should be obsoleted, size_t is in C90. + AN_IDENTIFIER([size_t], [AC_TYPE_SIZE_T]) +-AC_DEFUN([AC_TYPE_SIZE_T], [AC_CHECK_TYPE(size_t, unsigned int)]) ++AC_DEFUN([AC_TYPE_SIZE_T], ++[AC_CHECK_TYPE([size_t], [], ++ [AC_DEFINE([size_t], [unsigned int], ++ [Define as 'unsigned int' if <stddef.h> doesn't define.])])]) + + AN_IDENTIFIER([ssize_t], [AC_TYPE_SSIZE_T]) +-AC_DEFUN([AC_TYPE_SSIZE_T], [AC_CHECK_TYPE(ssize_t, int)]) ++AC_DEFUN([AC_TYPE_SSIZE_T], ++[AC_CHECK_TYPE([ssize_t], [], ++ [AC_DEFINE([ssize_t], [int], ++ [Define as 'int' if <sys/types.h> doesn't define.])])]) ++ + + AN_IDENTIFIER([pid_t], [AC_TYPE_PID_T]) + AC_DEFUN([AC_TYPE_PID_T], +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0011-Make-AC_PROG_GCC_TRADITIONAL-a-compatibility-alias-f.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0011-Make-AC_PROG_GCC_TRADITIONAL-a-compatibility-alias-f.patch new file mode 100644 index 0000000000..9c1f435d53 --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0011-Make-AC_PROG_GCC_TRADITIONAL-a-compatibility-alias-f.patch @@ -0,0 +1,180 @@ +From daaca7f74f94d6a7a51d571156d5fbaba5ef9a87 Mon Sep 17 00:00:00 2001 +From: Zack Weinberg <zackw@panix.com> +Date: Sun, 2 Apr 2023 21:03:30 -0400 +Subject: [PATCH 11/29] Make AC_PROG_GCC_TRADITIONAL a compatibility alias for + AC_PROG_CC. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This macro is one of the last remaining internal uses of AC_EGREP_CPP. +It has only ever done anything useful with GCC, and GCC dropped +support for ‘traditional’ compilation in version 3.3 (released 2003) +so I do not think it is worth trying to preserve. + +* lib/autoconf/c.m4 (AC_PROG_GCC_TRADITIONAL): Make into a + compatibility alias for AC_PROG_CC, similar to AC_PROG_CC_STDC. +* lib/autoconf/general.m4 (AC_EGREP_CPP): Remove stale comment. +* doc/autoconf.texi, NEWS: Document this change. +* tests/mktests.pl: Exclude AC_PROG_GCC_TRADITIONAL from + autoupdate tests. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + NEWS | 7 +++++++ + doc/autoconf.texi | 29 ++++++++++++++--------------- + lib/autoconf/c.m4 | 30 ++++++------------------------ + lib/autoconf/general.m4 | 2 -- + tests/mktests.pl | 2 +- + 5 files changed, 28 insertions(+), 42 deletions(-) + +diff --git a/NEWS b/NEWS +index 6a106f155..53c57ff59 100644 +--- a/NEWS ++++ b/NEWS +@@ -81,6 +81,13 @@ GNU Autoconf NEWS - User visible changes. + with plain apostrophes instead of the older GNU style `like this' + with grave accent and apostrophe. + ++*** AC_PROG_GCC_TRADITIONAL no longer does anything. ++ ++ This macro has had no useful effect since GCC dropped support for ++ traditional-mode compilation in version 3.3 (released in 2003), and ++ the systems that needed it are also long obsolete. It is now a ++ compatibility synonym for AC_PROG_CC. ++ + ** Notable bug fixes + + *** Autoconf caches now use finer-grained timestamps. +diff --git a/doc/autoconf.texi b/doc/autoconf.texi +index 8db64d8bb..037c8055f 100644 +--- a/doc/autoconf.texi ++++ b/doc/autoconf.texi +@@ -7764,20 +7764,6 @@ This macro is obsolescent, as current C compilers support prototypes. + New programs need not use this macro. + @end defmac + +-@anchor{AC_PROG_GCC_TRADITIONAL} +-@defmac AC_PROG_GCC_TRADITIONAL +-@acindex{PROG_GCC_TRADITIONAL} +-@ovindex CC +-Add @option{-traditional} to output variable @code{CC} if using a +-GNU C compiler and @code{ioctl} does not work properly without +-@option{-traditional}. That usually happens when the fixed header files +-have not been installed on an old system. +- +-This macro is obsolescent, since current versions of the GNU C +-compiler fix the header files automatically when installed. +-@end defmac +- +- + @node C++ Compiler + @subsection C++ Compiler Characteristics + +@@ -23986,7 +23972,8 @@ These days portable programs should use @code{waitpid}, not + + @defmac AC_GCC_TRADITIONAL + @acindex{GCC_TRADITIONAL} +-Replaced by @code{AC_PROG_GCC_TRADITIONAL} (@pxref{AC_PROG_GCC_TRADITIONAL}). ++Replaced by @code{AC_PROG_GCC_TRADITIONAL} (@pxref{AC_PROG_GCC_TRADITIONAL}), ++which is itself obsolete. + @end defmac + + @defmac AC_GETGROUPS_T +@@ -24369,6 +24356,18 @@ Now done by @code{AC_PROG_CC} (@pxref{AC_PROG_CC}). + Now done by @code{AC_PROG_CC} (@pxref{AC_PROG_CC}). + @end defmac + ++@anchor{AC_PROG_GCC_TRADITIONAL} ++@defmac AC_PROG_GCC_TRADITIONAL ++@acindex{PROG_GCC_TRADITIONAL} ++Used to put GCC into ``traditional'' (pre-ISO C) compilation mode, ++on systems with headers that did not work correctly with a ++standard-compliant compiler. GCC has not supported traditional ++compilation in many years, and all of the systems that required this are ++long obsolete themselves. This macro is now a compatibility synonym for ++@code{AC_PROG_CC} (@pxref{AC_PROG_CC}). ++ ++@end defmac ++ + @defmac AC_PROGRAMS_CHECK + @acindex{PROGRAMS_CHECK} + Replaced by @code{AC_CHECK_PROGS} (@pxref{AC_CHECK_PROGS}). +diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4 +index fef6c516d..33648b5b9 100644 +--- a/lib/autoconf/c.m4 ++++ b/lib/autoconf/c.m4 +@@ -551,30 +551,6 @@ fi[]dnl + ])# _AC_PROG_CC_G + + +-# AC_PROG_GCC_TRADITIONAL +-# ----------------------- +-AC_DEFUN([AC_PROG_GCC_TRADITIONAL], +-[AC_REQUIRE([AC_PROG_CC])dnl +-if test $ac_cv_c_compiler_gnu = yes; then +- AC_CACHE_CHECK(whether $CC needs -traditional, +- ac_cv_prog_gcc_traditional, +-[ ac_pattern="Autoconf.*'x'" +- AC_EGREP_CPP($ac_pattern, [#include <sgtty.h> +-Autoconf TIOCGETP], +- ac_cv_prog_gcc_traditional=yes, ac_cv_prog_gcc_traditional=no) +- +- if test $ac_cv_prog_gcc_traditional = no; then +- AC_EGREP_CPP($ac_pattern, [#include <termio.h> +-Autoconf TCGETA], +- ac_cv_prog_gcc_traditional=yes) +- fi]) +- if test $ac_cv_prog_gcc_traditional = yes; then +- CC="$CC -traditional" +- fi +-fi +-])# AC_PROG_GCC_TRADITIONAL +- +- + # AC_PROG_CC_C_O + # -------------- + AC_DEFUN([AC_PROG_CC_C_O], +@@ -1675,6 +1651,12 @@ AU_DEFUN([AC_PROG_CC_STDC], + [$0 is obsolete; use AC_PROG_CC] + ) + ++# AC_PROG_GCC_TRADITIONAL ++# ----------------------- ++AU_DEFUN([AC_PROG_GCC_TRADITIONAL], ++ [AC_REQUIRE([AC_PROG_CC])], ++ [$0 is obsolete; use AC_PROG_CC] ++) + + # AC_C_BACKSLASH_A + # ---------------- +diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 +index ecda0a51c..47d896d54 100644 +--- a/lib/autoconf/general.m4 ++++ b/lib/autoconf/general.m4 +@@ -2766,8 +2766,6 @@ AU_DEFUN([AC_TRY_CPP], + # AC_EGREP_CPP(PATTERN, PROGRAM, + # [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + # ------------------------------------------------------ +-# Because this macro is used by AC_PROG_GCC_TRADITIONAL, which must +-# come early, it is not included in AC_BEFORE checks. + AC_DEFUN([AC_EGREP_CPP], + [AC_LANG_PREPROC_REQUIRE()dnl + AC_REQUIRE([_AC_PROG_EGREP_TRADITIONAL])dnl +diff --git a/tests/mktests.pl b/tests/mktests.pl +index effed0bca..81f63586c 100644 +--- a/tests/mktests.pl ++++ b/tests/mktests.pl +@@ -112,7 +112,7 @@ my @ac_exclude_list = ( + # Check all AU_DEFUN'ed macros with AT_CHECK_AU_MACRO, except these. + my @au_exclude_list = ( + # Empty. +- qr/^AC_(C_CROSS|PROG_CC_(C[89]9|STDC))$/, ++ qr/^AC_(C_CROSS|PROG_(CC_(C[89]9|STDC)|GCC_TRADITIONAL))$/, + + # Use AC_REQUIRE. + qr/^AC_(CYGWIN|MINGW32|EMXOS2)$/, +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0012-Overhaul-AC_TYPE_GETGROUPS-and-AC_FUNC_GETGROUPS.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0012-Overhaul-AC_TYPE_GETGROUPS-and-AC_FUNC_GETGROUPS.patch new file mode 100644 index 0000000000..4d28101b46 --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0012-Overhaul-AC_TYPE_GETGROUPS-and-AC_FUNC_GETGROUPS.patch @@ -0,0 +1,328 @@ +From b5891a57b586ef6ff78bb752d62915b78cd58d7e Mon Sep 17 00:00:00 2001 +From: Zack Weinberg <zackw@panix.com> +Date: Sun, 2 Apr 2023 15:07:58 -0400 +Subject: [PATCH 12/29] Overhaul AC_TYPE_GETGROUPS and AC_FUNC_GETGROUPS. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +AC_TYPE_GETGROUPS is the last remaining use of AC_EGREP_HEADER in +stock Autoconf macros. It uses it only when cross compiling, as a +fallback from an AC_RUN_IFELSE check, testing for a bug in system +headers from the late 1980s or early 1990s, where gid_t *existed* +but the second argument to getgroups needed to be an array of int, +and this didn’t cause a compile error (i.e. the system headers +declare getgroups with no prototype or an incorrect prototype). +AC_FUNC_GETGROUPS also uses AC_RUN_IFELSE to test for obscure +problems specific to long-obsolete Unixes. + +The downsides of AC_RUN_IFELSE and AC_EGREP_HEADER seem more severe +than the chances of someone compiling a current-generation program, +that uses getgroups, on an OS old enough to have one of the really +nasty bugs. Accordingly, this patch changes AC_FUNC_GETGROUPS to use +a host_os-based *blacklist* both in native and cross compilation. +This is limited to the two host_os values for which either our old +code, or Gnulib, documented a serious bug: ultrix* and nextstep*. +Currently it does not try to pin down the exact version ranges subject +to the bugs — that would require research by someone with access to +the full history of these OSes. + +An incorrect guess by this blacklist can be overridden by setting +ac_cv_func_getgroups_works in config.site. AC_TYPE_GETGROUPS, for its +part, now does a series of regular old AC_COMPILE_IFELSE checks to +probe the prototype of getgroups, and considers that good enough. + +While I was in there I noticed that AC_FUNC_GETGROUPS does not +AC_SUBST a documented output variable, and that the name of this +variable is misspelled in the manual. + +* lib/autoconf/functions.m4 (AC_FUNC_GETGROUPS): Use AC_SEARCH_LIBS + to probe for getgroups. Use an AC_CANONICAL_HOST-based blacklist + for bug detection, not AC_RUN_IFELSE. AC_SUBST the GETGROUPS_LIB + output variable. +* lib/autoconf/types.m4 (AC_TYPE_GETGROUPS): Check only the prototype + of getgroups, using AC_COMPILE_IFELSE; do not use either AC_RUN_IFELSE + or AC_EGREP_HEADER. +* doc/autoconf.texi: Update to match. Correct misspelling of + GETGROUPS_LIB. +* tests.local.at (_AT_CHECK_ENV): Allow GETGROUPS_LIB output variable. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + NEWS | 11 +++++ + doc/autoconf.texi | 25 ++++++---- + lib/autoconf/functions.m4 | 61 ++++++++++++------------ + lib/autoconf/types.m4 | 97 ++++++++++++++++++++++++--------------- + tests/local.at | 2 +- + 5 files changed, 120 insertions(+), 76 deletions(-) + +diff --git a/NEWS b/NEWS +index 53c57ff59..8e4ecc1bf 100644 +--- a/NEWS ++++ b/NEWS +@@ -38,6 +38,17 @@ GNU Autoconf NEWS - User visible changes. + This matters only for uses that, contrary to the documentation + and despite warnings, use m4_divert with numbered diversions. + ++*** AC_FUNC_GETGROUPS and AC_TYPE_GETGROUPS no longer run test programs. ++ These macros were testing for OS bugs that we believe are at least ++ twenty years in the past. Most operating systems are now trusted to ++ provide an accurate prototype for getgroups in unistd.h, and to ++ implement it as specified in POSIX. ++ ++ AC_FUNC_GETGROUPS still includes a short blacklist of OSes with ++ known, severe bugs in getgroups. It can be overridden using ++ config.site. If you encounter a mistake in this blacklist ++ please report it to bug-autoconf. ++ + ** New features + + *** New macro AC_SYS_YEAR2038. +diff --git a/doc/autoconf.texi b/doc/autoconf.texi +index 037c8055f..5d5f613e6 100644 +--- a/doc/autoconf.texi ++++ b/doc/autoconf.texi +@@ -5257,17 +5257,26 @@ and also contains workarounds for other portability problems of + @defmac AC_FUNC_GETGROUPS + @acindex{FUNC_GETGROUPS} + @cvindex HAVE_GETGROUPS +-@ovindex GETGROUPS_LIBS ++@ovindex GETGROUPS_LIB + @c @fuindex getgroups + @prindex @code{getgroups} + @caindex func_getgroups_works +-If the @code{getgroups} function is available and works, +-define @code{HAVE_GETGROUPS}. Set @code{GETGROUPS_LIBS} to any libraries +-needed to get that function. This macro runs @code{AC_TYPE_GETGROUPS}. +- +-This macro is obsolescent. New programs need not use this macro. But +-they may want to use the Gnulib module @code{getgroups}, which provides +-workarounds to other portability problems of this function. ++Perform all the checks performed by @code{AC_TYPE_GETGROUPS} ++(@pxref{AC_TYPE_GETGROUPS}). ++Then, if the @code{getgroups} function is available ++and known to work correctly, define @code{HAVE_GETGROUPS}. ++Set the output variable @code{GETGROUPS_LIB} to any libraries ++needed to get that function. ++ ++This macro relies on a list of systems with known, serious bugs in ++@code{getgroups}. If this list mis-identifies your system's ++@code{getgroups} as buggy, or as not buggy, you can override it by ++setting the cache variable @code{ac_cv_func_getgroups_works} in a ++@file{config.site} file (@pxref{Site Defaults}). Please also report the ++error to @email{bug-autoconf@@gnu.org, the Autoconf Bugs mailing list}. ++ ++The Gnulib module @code{getgroups} provides workarounds for additional, ++less severe portability problems with this function. + @end defmac + + @anchor{AC_FUNC_GETLOADAVG} +diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4 +index 655d6ba8f..74512e97d 100644 +--- a/lib/autoconf/functions.m4 ++++ b/lib/autoconf/functions.m4 +@@ -698,47 +698,46 @@ AS_IF([test "$ac_cv_func_fseeko_ftello" = "need _LARGEFILE_SOURCE"], + # When cross-compiling, assume getgroups is broken. + AN_FUNCTION([getgroups], [AC_FUNC_GETGROUPS]) + AC_DEFUN([AC_FUNC_GETGROUPS], +-[AC_REQUIRE([AC_TYPE_GETGROUPS])dnl +-AC_REQUIRE([AC_TYPE_SIZE_T])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles +-AC_CHECK_FUNC(getgroups) ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_TYPE_GETGROUPS])dnl + +-# If we don't yet have getgroups, see if it's in -lbsd. ++# On older systems getgroups might be in -lbsd. + # This is reported to be necessary on an ITOS 3000WS running SEIUX 3.1. + ac_save_LIBS=$LIBS +-if test $ac_cv_func_getgroups = no; then +- AC_CHECK_LIB(bsd, getgroups, [GETGROUPS_LIB=-lbsd]) +-fi +- +-# Run the program to test the functionality of the system-supplied +-# getgroups function only if there is such a function. ++LIBS= ++GETGROUPS_LIB= ++AC_SEARCH_LIBS([getgroups], [bsd], ++ [test "$ac_res" = "none required" || GETGROUPS_LIB="$ac_res" ++ ac_cv_func_getgroups=yes], ++ [ac_cv_func_getgroups=no]) ++LIBS=$ac_save_LIBS ++AC_SUBST([GETGROUPS_LIB]) ++ ++# Known severe bugs in getgroups on particular systems. ++# - On Ultrix 4.3 and NextSTEP 3.2, getgroups (0, 0) is reported to ++# fail, rather than returning the number of supplementary groups as ++# it ought to. We do not know the exact range of releases affected ++# in either case. ++# We currently reject all versions of the systems with known bugs, and ++# no other systems. Please send corrections to bug-autoconf@gnu.org. + if test $ac_cv_func_getgroups = yes; then ++ # This AC_CACHE_CHECK exists so that one may override an incorrect ++ # guess by setting ac_cv_func_getgroups_works in a config.site file. + AC_CACHE_CHECK([for working getgroups], ac_cv_func_getgroups_works, +- [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT], +- [[/* On Ultrix 4.3, getgroups (0, 0) always fails. */ +- return getgroups (0, 0) == -1;]])], +- [ac_cv_func_getgroups_works=yes], +- [ac_cv_func_getgroups_works=no], +- [case "$host_os" in # (( +- # Guess yes on glibc systems. +- *-gnu*) ac_cv_func_getgroups_works="guessing yes" ;; +- # If we don't know, assume the worst. +- *) ac_cv_func_getgroups_works="guessing no" ;; +- esac]) +- ]) ++ [AS_CASE([$host_os], ++ [ultrix* | nextstep*], ++ [ac_cv_func_getgroups_works=no # getgroups(0,0) fails ++], ++ [ac_cv_func_getgroups_works=yes])]) + else + ac_cv_func_getgroups_works=no + fi +-case "$ac_cv_func_getgroups_works" in +- *yes) +- AC_DEFINE(HAVE_GETGROUPS, 1, +- [Define to 1 if your system has a working 'getgroups' function.]) +- ;; +-esac +-LIBS=$ac_save_LIBS ++if test $ac_cv_func_getgroups_works = yes; then ++ AC_DEFINE(HAVE_GETGROUPS, 1, ++ [Define to 1 if your system has a working 'getgroups' function.]) ++fi + ])# AC_FUNC_GETGROUPS + +- + # _AC_LIBOBJ_GETLOADAVG + # --------------------- + # Set up the AC_LIBOBJ replacement of 'getloadavg'. +diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4 +index ef2456135..af3872b2f 100644 +--- a/lib/autoconf/types.m4 ++++ b/lib/autoconf/types.m4 +@@ -258,44 +258,69 @@ AN_IDENTIFIER([ptrdiff_t], [AC_CHECK_TYPES]) + # AC_TYPE_GETGROUPS + # ----------------- + AC_DEFUN([AC_TYPE_GETGROUPS], ++dnl We now unconditionally assume that if <unistd.h> has a prototype for ++dnl getgroups, it is accurate; and that if <unistd.h> does _not_ declare ++dnl getgroups with a prototype, the second argument is an array of int. ++dnl (Older versions of Autoconf made these assumptions only when cross ++dnl compiling.) See AC_FUNC_GETGROUPS, over in functions.m4, for why ++dnl this uses AC_COMPILE_IFELSE rather than AC_LINK_IFELSE. + [AC_REQUIRE([AC_TYPE_UID_T])dnl +-AC_CACHE_CHECK(type of array argument to getgroups, ac_cv_type_getgroups, +-[AC_RUN_IFELSE([AC_LANG_SOURCE( +-[[/* Thanks to Mike Rendell for this test. */ +-]AC_INCLUDES_DEFAULT[ +-#define NGID 256 +-#undef MAX +-#define MAX(x, y) ((x) > (y) ? (x) : (y)) +- +-int +-main (void) +-{ +- gid_t gidset[NGID]; +- int i, n; +- union { gid_t gval; long int lval; } val; +- +- val.lval = -1; +- for (i = 0; i < NGID; i++) +- gidset[i] = val.gval; +- n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1, +- gidset); +- /* Exit non-zero if getgroups seems to require an array of ints. This +- happens when gid_t is short int but getgroups modifies an array +- of ints. */ +- return n > 0 && gidset[n] != val.gval; +-}]])], +- [ac_cv_type_getgroups=gid_t], +- [ac_cv_type_getgroups=int], +- [ac_cv_type_getgroups=cross]) +-if test $ac_cv_type_getgroups = cross; then +- dnl When we can't run the test program (we are cross compiling), presume +- dnl that <unistd.h> has either an accurate prototype for getgroups or none. +- dnl Old systems without prototypes probably use int. +- AC_EGREP_HEADER([getgroups.*int.*gid_t], unistd.h, +- ac_cv_type_getgroups=gid_t, ac_cv_type_getgroups=int) +-fi]) ++AC_CACHE_CHECK([type of array argument to getgroups], ac_cv_type_getgroups, ++[# If AC_TYPE_UID_T says there isn't any gid_t typedef, then we can skip ++# everything below. ++AS_IF([test $ac_cv_type_gid_t = no], ++ [ac_cv_type_getgroups=int], ++ [# Test programs below rely on strict type checking of extern declarations: ++ # 'extern int getgroups(int, int *); extern int getgroups(int, pid_t *);' ++ # is valid in C89 if and only if pid_t is a typedef for int. Unlike ++ # anything involving either an assignment or a function call, compilers ++ # tend to make this kind of type mismatch a hard error, not just an ++ # "incompatible pointer types" warning. ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( ++[AC_INCLUDES_DEFAULT ++[extern int getgroups(int, gid_t *);]], ++[[return !(getgroups(0, 0) >= 0);]])], ++ [ac_getgroups_gidarray=yes], ++ [ac_getgroups_gidarray=no]) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( ++[AC_INCLUDES_DEFAULT ++[extern int getgroups(int, int *);]], ++[[return !(getgroups(0, 0) >= 0);]])], ++ [ac_getgroups_intarray=yes], ++ [ac_getgroups_intarray=no]) ++ ++ AS_CASE([int:$ac_getgroups_intarray,gid:$ac_getgroups_gidarray], ++ [int:yes,gid:no], [ac_cv_type_getgroups=int], ++ [int:no,gid:yes], [ac_cv_type_getgroups=gid_t], ++ [int:yes,gid:yes], [ ++ # Both programs compiled - this means *either* that getgroups ++ # was declared with no prototype, in which case we should use int, ++ # or that it was declared prototyped but gid_t is a typedef for int, ++ # in which case we should use gid_t. Distinguish the two cases ++ # by testing if the compiler catches a blatantly incorrect function ++ # signature for getgroups. ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( ++[AC_INCLUDES_DEFAULT ++[extern int getgroups(int, float);]], ++[[return !(getgroups(0, 0) >= 0);]])], [ ++ # Compiler did not catch incorrect argument list; ++ # getgroups is unprototyped. ++ ac_cv_type_getgroups=int ++ ], [ ++ # Compiler caught incorrect argument list; ++ # gid_t is a typedef for int. ++ ac_cv_type_getgroups=gid_t ++ ]) ++ ], [ ++ # Both programs failed to compile - this probably means getgroups ++ # wasn't declared at all. Use 'int', as this is probably a very ++ # old system where the type _would have been_ int. ++ ac_cv_type_getgroups=int ++ ]) ++ ]) ++])dnl AC_CACHE_CHECK + AC_DEFINE_UNQUOTED(GETGROUPS_T, $ac_cv_type_getgroups, +- [Define to the type of elements in the array set by ++ [Define to the type of elements in the array argument to + 'getgroups'. Usually this is either 'int' or 'gid_t'.]) + ])# AC_TYPE_GETGROUPS + +diff --git a/tests/local.at b/tests/local.at +index 64a9fb264..db49f84a9 100644 +--- a/tests/local.at ++++ b/tests/local.at +@@ -401,7 +401,7 @@ if test -f state-env.before && test -f state-env.after; then + [interpval|PATH_SEPARATOR], + [GFC|F77_DUMMY_MAIN|f77_(case|underscore)], + [FC(_DUMMY_MAIN|FLAGS|LIBS|FLAGS_[fF]|_MODEXT|_MODINC|_MODOUT|_DEFINE)?], +- [ALLOCA|GETLOADAVG_LIBS|KMEM_GROUP|NEED_SETGID|POW_LIB], ++ [ALLOCA|GETGROUPS_LIB|GETLOADAVG_LIBS|KMEM_GROUP|NEED_SETGID|POW_LIB], + [AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|MKDIR_P|AR|RANLIB|SET_MAKE|YACC], + [EGREP_TRADITIONAL], + [GREP|[EF]GREP|SED], +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0013-Fold-AC_C_STRINGIZE-into-AC_PROG_CC.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0013-Fold-AC_C_STRINGIZE-into-AC_PROG_CC.patch new file mode 100644 index 0000000000..2dadd83320 --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0013-Fold-AC_C_STRINGIZE-into-AC_PROG_CC.patch @@ -0,0 +1,84 @@ +From a7dc6d83c7d12b8409c512c3c10ad29f01e6c164 Mon Sep 17 00:00:00 2001 +From: Zack Weinberg <zackw@panix.com> +Date: Sun, 2 Apr 2023 21:54:31 -0400 +Subject: [PATCH 13/29] Fold AC_C_STRINGIZE into AC_PROG_CC. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Another of the last few uses of AC_EGREP_CPP is to check for the ISO C +“stringification” operator. As this is a feature of C89, let’s fold +the test into the extensive C89 tests we already have, and make +AC_C_STRINGIZE just lean on AC_PROG_CC, in the same way +AC_C_PROTOTYPES does. + +* lib/autoconf/c.m4 (_AC_C_C89_TEST_GLOBALS): Add test of preprocessor + stringification and token pasting. + (AC_C_STRINGIZE): Just check ac_prog_cc_stdc. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/autoconf/c.m4 | 31 ++++++++++++++++++++----------- + 1 file changed, 20 insertions(+), 11 deletions(-) + +diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4 +index 33648b5b9..c8c6a665c 100644 +--- a/lib/autoconf/c.m4 ++++ b/lib/autoconf/c.m4 +@@ -1143,6 +1143,21 @@ static char *f (char * (*g) (char **, int), char **p, ...) + return s; + } + ++/* C89 style stringification. */ ++#define noexpand_stringify(a) #a ++const char *stringified = noexpand_stringify(arbitrary+token=sequence); ++ ++/* C89 style token pasting. Exercises some of the corner cases that ++ e.g. old MSVC gets wrong, but not very hard. */ ++#define noexpand_concat(a,b) a##b ++#define expand_concat(a,b) noexpand_concat(a,b) ++extern int vA; ++extern int vbee; ++#define aye A ++#define bee B ++int *pvA = &expand_concat(v,aye); ++int *pvbee = &noexpand_concat(v,bee); ++ + /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated +@@ -2112,16 +2127,10 @@ fi + # -------------- + # Checks if '#' can be used to glue strings together at the CPP level. + # Defines HAVE_STRINGIZE if positive. ++# Obsolete - new code should assume C89 compliance. + AC_DEFUN([AC_C_STRINGIZE], +-[AC_CACHE_CHECK([for preprocessor stringizing operator], +- [ac_cv_c_stringize], +-[AC_EGREP_CPP([@%:@teststring], +- [@%:@define x(y) #y +- +-char *s = x(teststring);], +- [ac_cv_c_stringize=no], +- [ac_cv_c_stringize=yes])]) +-if test $ac_cv_c_stringize = yes; then ++[AC_REQUIRE([AC_PROG_CC]) ++if test "$ac_prog_cc_stdc" != no; then + AC_DEFINE(HAVE_STRINGIZE, 1, + [Define to 1 if cpp supports the ANSI @%:@ stringizing operator.]) + fi +@@ -2130,8 +2139,8 @@ fi + + # AC_C_PROTOTYPES + # --------------- +-# Check if the C compiler supports prototypes, included if it needs +-# options. ++# Check if the C compiler supports prototypes. ++# Obsolete - new code should assume C89 compliance. + AC_DEFUN([AC_C_PROTOTYPES], + [AC_REQUIRE([AC_PROG_CC])dnl + if test "$ac_prog_cc_stdc" != no; then +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0014-Remove-the-last-few-internal-uses-of-AC_EGREP_CPP.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0014-Remove-the-last-few-internal-uses-of-AC_EGREP_CPP.patch new file mode 100644 index 0000000000..85e9a45615 --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0014-Remove-the-last-few-internal-uses-of-AC_EGREP_CPP.patch @@ -0,0 +1,116 @@ +From e25dfa75e18295d28de67747b4ff9d65f65c4f06 Mon Sep 17 00:00:00 2001 +From: Zack Weinberg <zackw@panix.com> +Date: Sun, 2 Apr 2023 22:17:55 -0400 +Subject: [PATCH 14/29] Remove the last few internal uses of AC_EGREP_CPP. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Most of the remaining uses were converted to AC_COMPILE_IFELSE. +The use in AC_FUNC_LOADAVG becomes an AC_PREPROC_IFELSE because +we can’t be sure getloadavg.c can be _compiled_ at this point in +the build. The use in AC_C_VARARRAYS could be either _PREPROC_ or +_COMPILE_; we use _COMPILE_ because, _PREPROC_ is never used, then +we don’t have to do the “checking how to run the C preprocessor” test. + +* lib/autoconf/c.m4 (AC_C_VARARRAYS): Use AC_COMPILE_IFELSE instead of + AC_EGREP_CPP. +* lib/autoconf/headers.m4 (_AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H) + (_AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL_H): Likewise. +* lib/autoconf/functions.m4 (AC_FUNC_GETLOADAVG): Use AC_PREPROC_IFELSE + instead of AC_EGREP_CPP. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/autoconf/c.m4 | 8 ++++---- + lib/autoconf/functions.m4 | 10 +++++----- + lib/autoconf/headers.m4 | 24 ++++++++++-------------- + 3 files changed, 19 insertions(+), 23 deletions(-) + +diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4 +index c8c6a665c..b8350c339 100644 +--- a/lib/autoconf/c.m4 ++++ b/lib/autoconf/c.m4 +@@ -2197,11 +2197,11 @@ AC_DEFUN([AC_C_VARARRAYS], + [ + AC_CACHE_CHECK([for variable-length arrays], + ac_cv_c_vararrays, +- [AC_EGREP_CPP([defined], +- [#ifdef __STDC_NO_VLA__ +- defined ++ [AC_COMPILE_IFELSE([AC_LANG_SOURCE( ++[[ #ifndef __STDC_NO_VLA__ ++ #error __STDC_NO_VLA__ not defined + #endif +- ], ++]])], + [ac_cv_c_vararrays='no: __STDC_NO_VLA__ is defined'], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( +diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4 +index 74512e97d..499e4c024 100644 +--- a/lib/autoconf/functions.m4 ++++ b/lib/autoconf/functions.m4 +@@ -842,11 +842,11 @@ AC_CHECK_FUNCS(getloadavg, [], + # Some definitions of getloadavg require that the program be installed setgid. + AC_CACHE_CHECK(whether getloadavg requires setgid, + ac_cv_func_getloadavg_setgid, +-[AC_EGREP_CPP([Yowza Am I SETGID yet], +-[#include "$srcdir/$ac_config_libobj_dir/getloadavg.c" +-#ifdef LDAV_PRIVILEGED +-Yowza Am I SETGID yet +-@%:@endif], ++[AC_PREPROC_IFELSE([AC_LANG_SOURCE( ++[[#include "$srcdir/$ac_config_libobj_dir/getloadavg.c" ++#ifndef LDAV_PRIVILEGED ++#error setgid not needed ++@%:@endif]])], + ac_cv_func_getloadavg_setgid=yes, + ac_cv_func_getloadavg_setgid=no)]) + if test $ac_cv_func_getloadavg_setgid = yes; then +diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4 +index 7f70e8fd4..19c124cc3 100644 +--- a/lib/autoconf/headers.m4 ++++ b/lib/autoconf/headers.m4 +@@ -721,13 +721,11 @@ you to include it and time.h simultaneously.]) + m4_define([_AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H], + [AC_CACHE_CHECK([whether termios.h defines TIOCGWINSZ], + ac_cv_sys_tiocgwinsz_in_termios_h, +-[AC_EGREP_CPP([yes], +- [#include <sys/types.h> +-#include <termios.h> +-#ifdef TIOCGWINSZ +- yes +-#endif +-], ++[AC_COMPILE_IFELSE([AC_LANG_SOURCE( ++[AC_INCLUDES_DEFAULT ++[#include <termios.h> ++const int tiocgwinsz = TIOCGWINSZ; ++]])], + ac_cv_sys_tiocgwinsz_in_termios_h=yes, + ac_cv_sys_tiocgwinsz_in_termios_h=no)]) + ])# _AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H +@@ -738,13 +736,11 @@ m4_define([_AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H], + m4_define([_AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL], + [AC_CACHE_CHECK([whether sys/ioctl.h defines TIOCGWINSZ], + ac_cv_sys_tiocgwinsz_in_sys_ioctl_h, +-[AC_EGREP_CPP([yes], +- [#include <sys/types.h> +-#include <sys/ioctl.h> +-#ifdef TIOCGWINSZ +- yes +-#endif +-], ++[AC_COMPILE_IFELSE([AC_LANG_SOURCE( ++[AC_INCLUDES_DEFAULT ++[#include <sys/ioctl.h> ++const int tiocgwinsz = TIOCGWINSZ; ++]])], + ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=yes, + ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=no)]) + ])# _AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0015-Support-circa-early-2022-Gnulib.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0015-Support-circa-early-2022-Gnulib.patch new file mode 100644 index 0000000000..36d1a94be6 --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0015-Support-circa-early-2022-Gnulib.patch @@ -0,0 +1,32 @@ +From 1982523c6f052a2b361035a9d5d9737510ed0738 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Mon, 3 Apr 2023 09:12:40 -0700 +Subject: [PATCH 15/29] Support circa early 2022 Gnulib + +Problem reported by Frederic Berat in: +https://lists.gnu.org/r/bug-rcs/2023-04/msg00001.html +* lib/autoconf/specific.m4 (_AC_SYS_LARGEFILE_TEST_INCLUDES): +Bring back for compatibility with post-2.71, pre-2.73 Gnulib. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/autoconf/specific.m4 | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 +index a2dc5d488..5dc006959 100644 +--- a/lib/autoconf/specific.m4 ++++ b/lib/autoconf/specific.m4 +@@ -277,6 +277,8 @@ m4_define([_AC_SYS_LARGEFILE_TEST_CODE], + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]];[]dnl + ]) ++# Defined by Autoconf 2.71 and circa 2022 Gnulib unwisely depended on it. ++m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], [_AC_SYS_LARGEFILE_TEST_CODE]) + + # _AC_SYS_LARGEFILE_OPTIONS + # ------------------------- +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0016-Improve-year2038-largefile-option-processing.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0016-Improve-year2038-largefile-option-processing.patch new file mode 100644 index 0000000000..e96faf2666 --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0016-Improve-year2038-largefile-option-processing.patch @@ -0,0 +1,121 @@ +From a1e82aff0fd842b0f09e2cd166560dfda725ba13 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Sun, 9 Apr 2023 11:41:57 -0700 +Subject: [PATCH 16/29] Improve year2038, largefile option processing +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* lib/autoconf/specific.m4 (_AC_SYS_YEAR2038_PROBE) +(_AC_SYS_YEAR2038_ENABLE, _AC_SYS_YEAR2038_OPT_IN) +(AC_SYS_YEAR2038, _AC_SYS_LARGEFILE_PROBE) +(_AC_SYS_LARGEFILE_ENABLE): Do not use enable_largefile to record +whether largefile is required, as ‘./configure +--disable-largefile’ sets enable_largefile=no even if largefile is +required and this disables largefile. Instead, use a separate +shell variable ac_largefile_required and test it as well. +Similarly for enable_year2038. +(_AC_SYS_LARGEFILE_ENABLE): Omit --disable-largefile help string +if year2038 is required, since largefile is a prereq for year2038. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/autoconf/specific.m4 | 35 ++++++++++++++++++++++------------- + 1 file changed, 22 insertions(+), 13 deletions(-) + +diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 +index 5dc006959..1a3f4a65c 100644 +--- a/lib/autoconf/specific.m4 ++++ b/lib/autoconf/specific.m4 +@@ -155,10 +155,10 @@ AS_CASE([$ac_cv_sys_year2038_opts], + ["none needed"], [], + ["support not detected"], + [ac_have_year2038=no +- AS_CASE([$enable_year2038], +- [required], ++ AS_CASE([$ac_year2038_required,$enable_year2038], ++ [yes,*], + [AC_MSG_FAILURE([support for timestamps after Jan 2038 is required])], +- [yes], ++ [*,yes], + [# If we're not cross compiling and 'touch' works with a large + # timestamp, then we can presume the system supports wider time_t + # *somehow* and we just weren't able to detect it. One common +@@ -209,10 +209,12 @@ AS_CASE([$ac_cv_sys_year2038_opts], + m4_define([_AC_SYS_YEAR2038_ENABLE], + [m4_divert_text([DEFAULTS], + m4_provide_if([AC_SYS_YEAR2038_REQUIRED], +- [enable_year2038=required], ++ [ac_year2038_required=yes], ++ [ac_year2038_required=no]))dnl ++m4_divert_text([DEFAULTS], + m4_provide_if([AC_SYS_YEAR2038], + [enable_year2038=yes], +- [enable_year2038=no])))]dnl ++ [enable_year2038=no]))]dnl + [m4_provide_if([AC_SYS_YEAR2038_REQUIRED], [], + [AC_ARG_ENABLE([year2038], + m4_provide_if([AC_SYS_YEAR2038], +@@ -231,7 +233,8 @@ m4_define([_AC_SYS_YEAR2038_ENABLE], + # documented macro. + AC_DEFUN([_AC_SYS_YEAR2038_OPT_IN], + [m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl +- AS_IF([test "$enable_year2038" != no], [_AC_SYS_YEAR2038_PROBE]) ++ AS_IF([test "$ac_year2038_required,$enable_year2038" != no,no], ++ [_AC_SYS_YEAR2038_PROBE]) + AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE]) + ])]) + +@@ -244,7 +247,8 @@ AC_DEFUN([AC_SYS_YEAR2038], + [m4_provide_if([AC_SYS_LARGEFILE_REQUIRED], [], + [AC_REQUIRE([AC_SYS_LARGEFILE])])]dnl + [m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl +- AS_IF([test "$enable_year2038" != no], [_AC_SYS_YEAR2038_PROBE]) ++ AS_IF([test "$ac_year2038_required,$enable_year2038" != no,no], ++ [_AC_SYS_YEAR2038_PROBE]) + AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE]) + ])]) + +@@ -326,7 +330,7 @@ AS_CASE([$ac_cv_sys_largefile_opts], + ["none needed"], [], + ["support not detected"], + [ac_have_largefile=no +- AS_IF([test $enable_largefile = required], ++ AS_IF([test $ac_largefile_required,$ac_year2038_required != no,no], + [AC_MSG_FAILURE([support for large files is required])])], + + ["-D_FILE_OFFSET_BITS=64"], +@@ -358,11 +362,15 @@ _AC_SYS_YEAR2038_OPT_IN + m4_define([_AC_SYS_LARGEFILE_ENABLE], + [m4_divert_text([DEFAULTS], + m4_provide_if([AC_SYS_LARGEFILE_REQUIRED], +- [enable_largefile=required], +- [enable_largefile=yes]))]dnl ++ [ac_largefile_required=yes], ++ [ac_largefile_required=no]))dnl ++m4_divert_text([DEFAULTS], ++ [enable_largefile=yes])]dnl + [m4_provide_if([AC_SYS_LARGEFILE_REQUIRED], [], +-[AC_ARG_ENABLE([largefile], +- [AS_HELP_STRING([--disable-largefile], [omit support for large files])])])]) ++ [m4_provide_if([AC_SYS_YEAR2038_REQUIRED], [], ++ [AC_ARG_ENABLE([largefile], ++ [AS_HELP_STRING([--disable-largefile], ++ [omit support for large files])])])])]) + + # AC_SYS_LARGEFILE + # ---------------- +@@ -377,7 +385,8 @@ m4_define([_AC_SYS_LARGEFILE_ENABLE], + # large files; see also AC_SYS_LARGEFILE_REQUIRED. + AC_DEFUN([AC_SYS_LARGEFILE], + [m4_provide_if([_AC_SYS_LARGEFILE_PROBE], [], [dnl +- AS_IF([test "$enable_largefile" != no], [_AC_SYS_LARGEFILE_PROBE]) ++ AS_IF([test "$ac_largefile_required,$enable_largefile,$ac_year2038_required" != no,no,no], ++ [_AC_SYS_LARGEFILE_PROBE]) + AC_CONFIG_COMMANDS_PRE([_AC_SYS_LARGEFILE_ENABLE]) + ])]) + +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0017-AC_SYS_YEAR2038-Fix-configure-failure-on-32-bit-ming.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0017-AC_SYS_YEAR2038-Fix-configure-failure-on-32-bit-ming.patch new file mode 100644 index 0000000000..f62fe1cd79 --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0017-AC_SYS_YEAR2038-Fix-configure-failure-on-32-bit-ming.patch @@ -0,0 +1,30 @@ +From 0cc3c4ca8e6c550bf590ae45a916982b6ec50203 Mon Sep 17 00:00:00 2001 +From: Bruno Haible <bruno@clisp.org> +Date: Fri, 14 Apr 2023 16:18:35 +0200 +Subject: [PATCH 17/29] AC_SYS_YEAR2038: Fix configure failure on 32-bit mingw. + +* lib/autoconf/specific.m4 (_AC_SYS_YEAR2038_PROBE): Use the same option +spelling as in _AC_SYS_YEAR2038_OPTIONS. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/autoconf/specific.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 +index 1a3f4a65c..3bf1a0ed1 100644 +--- a/lib/autoconf/specific.m4 ++++ b/lib/autoconf/specific.m4 +@@ -182,7 +182,7 @@ AS_CASE([$ac_cv_sys_year2038_opts], + [AC_DEFINE([_TIME_BITS], [64], + [Number of bits in time_t, on hosts where this is settable.])], + +- ["-D__MINGW_USE_VC2005_COMPAT=1"], ++ ["-D__MINGW_USE_VC2005_COMPAT"], + [AC_DEFINE([__MINGW_USE_VC2005_COMPAT], [1], + [Define to 1 on platforms where this makes time_t a 64-bit type.])], + +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0018-Document-limitation-of-BusyBox-tr.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0018-Document-limitation-of-BusyBox-tr.patch new file mode 100644 index 0000000000..478c4e4229 --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0018-Document-limitation-of-BusyBox-tr.patch @@ -0,0 +1,45 @@ +From e704a13c9644f4f4b9a9dd4e215ee7a1707f5850 Mon Sep 17 00:00:00 2001 +From: Bruno Haible <bruno@clisp.org> +Date: Fri, 3 Mar 2023 14:32:13 +0100 +Subject: [PATCH 18/29] Document limitation of BusyBox tr. + +BusyBox 1.35.0 tr, which is shipped with Alpine Linux 3.17, does not support +the POSIX [x*n] syntax. + +* doc/autoconf.texi (Limitations of Usual Tools): Document limitation of 'tr' +from BusyBox. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + doc/autoconf.texi | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/doc/autoconf.texi b/doc/autoconf.texi +index 5d5f613e6..b3c708e87 100644 +--- a/doc/autoconf.texi ++++ b/doc/autoconf.texi +@@ -20368,6 +20368,20 @@ $ @kbd{echo abc | coreutils/tr bc d} + add + @end example + ++On platforms with the BusyBox tools, @command{tr} does not support the ++@code{[@var{x}*@var{n}]} option syntax. ++ ++@example ++$ @kbd{echo abc | tr 'abcd' '[A*4]'} ++[A* ++$ @kbd{echo abc | coreutils/tr 'abcd' '[A*4]'} ++AAA ++$ @kbd{echo xyz | tr 'a-z' '[A*]'} ++]]] ++$ @kbd{echo xyz | coreutils/tr 'a-z' '[A*]'} ++AAA ++@end example ++ + Posix requires @command{tr} to operate on binary files. But at least + Solaris @command{/usr/ucb/tr} and @command{/usr/bin/tr} silently discard + @code{NUL} in the input prior to doing any translation. When using +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0019-AC_SYS_YEAR2038_REQUIRED-Fix-configure-failure-with-.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0019-AC_SYS_YEAR2038_REQUIRED-Fix-configure-failure-with-.patch new file mode 100644 index 0000000000..db9307e13c --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0019-AC_SYS_YEAR2038_REQUIRED-Fix-configure-failure-with-.patch @@ -0,0 +1,48 @@ +From 2277f2c15744ad1cc5cd1ecc50a43108e50530a2 Mon Sep 17 00:00:00 2001 +From: Bruno Haible <bruno@clisp.org> +Date: Wed, 19 Apr 2023 14:17:24 -0700 +Subject: [PATCH 19/29] AC_SYS_YEAR2038_REQUIRED: Fix configure failure with + MSVC. + +* lib/autoconf/specific.m4 (_AC_SYS_LARGEFILE_PROBE): Distinguish the results +"support not detected" and "supported through gnulib". If the result is +"supported through gnulib", don't fail. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/autoconf/specific.m4 | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 +index 3bf1a0ed1..f411695fe 100644 +--- a/lib/autoconf/specific.m4 ++++ b/lib/autoconf/specific.m4 +@@ -323,11 +323,24 @@ AC_DEFUN([_AC_SYS_LARGEFILE_PROBE], + test $ac_opt_found = no || break + done + CC="$ac_save_CC" ++ dnl Gnulib implements large file support for native Windows, based on the ++ dnl variables WINDOWS_64_BIT_OFF_T, WINDOWS_64_BIT_ST_SIZE. ++ m4_ifdef([gl_LARGEFILE], [ ++ AC_REQUIRE([AC_CANONICAL_HOST]) ++ if test $ac_opt_found != yes; then ++ AS_CASE([$host_os], ++ [mingw*], ++ [ac_cv_sys_largefile_opts="supported through gnulib" ++ ac_opt_found=yes] ++ ) ++ fi ++ ]) + test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected"]) + + ac_have_largefile=yes + AS_CASE([$ac_cv_sys_largefile_opts], + ["none needed"], [], ++ ["supported through gnulib"], [], + ["support not detected"], + [ac_have_largefile=no + AS_IF([test $ac_largefile_required,$ac_year2038_required != no,no], +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0020-Tone-down-year-2038-changes.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0020-Tone-down-year-2038-changes.patch new file mode 100644 index 0000000000..cbd89cc3ba --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0020-Tone-down-year-2038-changes.patch @@ -0,0 +1,405 @@ +From 9c0183724614517a67d0955065171465bab7154a Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Wed, 26 Apr 2023 18:21:48 -0700 +Subject: [PATCH 20/29] Tone down year-2038 changes + +New macro AC_SYS_YEAR2038_RECOMMENDED replaces new macro +AC_SYS_YEAR2038_REQUIRED, and gives the builder an out of +specifying --disable-year2038. Remove new macro +AC_SYS_LARGEFILE_REQUIRED, which was added only for symmetry and +does not seem to have a great need. +* NEWS, doc/autoconf.texi: Document this. +* lib/autoconf/specific.m4: +Be more specific about mid-January 2038 than just Jan 2038. +(_AC_SYS_YEAR2038_PROBE): Ignore IF-NOT-DETECTED arg. +If support is not detected, merely set ac_have_year2038=no instead +of erroring out. All callers changed. +(_AC_SYS_YEAR2038_OPT_IN): Remove. All callers removed. +(AC_SYS_YEAR2038): Simplify by requiring AC_SYS_LARGEFILE +and then testing the result. +(AC_SYS_YEAR2038_REQUIRED, AC_SYS_LARGEFILE_REQUIRED): Remove. +(AC_SYS_YEAR2038_RECOMMENDED): New macro. +(_AC_SYS_LARGEFILE_PROBE): If support is not detected, merely set +ac_have_largefile=no instead of erroring out. All callers changed. +Take on the burden of invoking year2038 probe as needed. +(AC_SYS_LARGEFILE): Simplify. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + NEWS | 18 ++-- + doc/autoconf.texi | 34 +++----- + lib/autoconf/specific.m4 | 177 +++++++++++---------------------------- + 3 files changed, 69 insertions(+), 160 deletions(-) + +diff --git a/NEWS b/NEWS +index 8e4ecc1bf..a48a00858 100644 +--- a/NEWS ++++ b/NEWS +@@ -51,7 +51,7 @@ GNU Autoconf NEWS - User visible changes. + + ** New features + +-*** New macro AC_SYS_YEAR2038. ++*** New macros AC_SYS_YEAR2038 and AC_SYS_YEAR2038_RECOMMENDED. + This causes 'configure' to widen time_t if possible on systems where + time_t by default cannot represent file and other timestamps after + January 2038. Widening is possible only on 32-bit GNU/Linux x86 and +@@ -67,18 +67,14 @@ GNU Autoconf NEWS - User visible changes. + This is similar to longstanding consistency requirements with + --enable-largefile and --disable-largefile. + ++ AC_SYS_YEAR2038_RECOMMENDED acts like AC_SYS_YEAR2038 except that ++ 'configure' fails if the target lacks support for post-2038 ++ timestamps and --disable-year2038 is not given. ++ + *** AC_SYS_LARGEFILE now optionally arranges to widen time_t. + It now acts like AC_SYS_YEAR2038, except 'configure' defaults to +- --disable-year2038 unless AC_SYS_YEAR2038 is also present. +- As with AC_SYS_YEAR2038, application and library builders should +- configure consistently. +- +-*** New macros AC_SYS_LARGEFILE_REQUIRED and AC_SYS_YEAR2038_REQUIRED. +- These act like AC_SYS_LARGEFILE and AC_SYS_YEAR2038 respectively, +- except that 'configure' fails if the target lacks support +- for large files and for post-2038 timestamps, respectively. +- As with AC_SYS_YEAR2038, application and library builders should +- configure consistently. ++ --disable-year2038 unless either AC_SYS_YEAR2038 or ++ AC_SYS_YEAR2038_RECOMMENDED is also present. + + *** AC_USE_SYSTEM_EXTENSIONS now enables C23 Annex F extensions + by defining __STDC_WANT_IEC_60559_EXT__. +diff --git a/doc/autoconf.texi b/doc/autoconf.texi +index b3c708e87..0f3047b31 100644 +--- a/doc/autoconf.texi ++++ b/doc/autoconf.texi +@@ -8808,18 +8808,20 @@ if possible. These types may include @code{blkcnt_t}, @code{dev_t}, + + Also, arrange for a @command{configure} option @code{--enable-year2038} + to request widening the type @code{time_t} as needed to represent file +-wand other timestamps after January 2038. This widening is possible ++wand other timestamps after mid-January 2038. This widening is possible + only on 32-bit GNU/Linux x86 and ARM systems with glibc 2.34 or later. + If year-2038 support is requested but @command{configure} fails to find a way + to widen @code{time_t} and inspection of the system suggests that + this feature is available somehow, @command{configure} will error out. + If you want the default to be @code{--enable-year2038}, you can use +-@code{AC_SYS_YEAR2038} instead of @code{AC_SYS_LARGEFILE}. ++@code{AC_SYS_YEAR2038} or @code{AC_SYS_YEAR2038_RECOMMENDED} ++instead of @code{AC_SYS_LARGEFILE}. + In other words, older packages that have long used @code{AC_SYS_LARGEFILE} + can have year-2038 support on 32-bit GNU/Linux x86 and ARM systems either by + regenerating @file{configure} with current Autoconf and configuring with +-@option{--enable-year2038}, or by using @code{AC_SYS_YEAR2038} and +-configuring without @option{--disable-year2038}. ++@option{--enable-year2038}, or by using @code{AC_SYS_YEAR2038} or ++@code{AC_SYS_YEAR2038_RECOMMENDED} and configuring without ++@option{--disable-year2038}. + A future version of Autoconf might change the @code{AC_SYS_LARGEFILE} + default to @code{--enable-year2038}; if and when that happens, + @code{AC_SYS_LARGEFILE} and @code{AC_SYS_YEAR2038} will become equivalent. +@@ -8886,19 +8888,6 @@ library, enabling or disabling the application's large-file support may + break binary compatibility with that library. + @end defmac + +-@defmac AC_SYS_LARGEFILE_REQUIRED +-@acindex{SYS_LARGEFILE_REQUIRED} +-This macro has the same effect as @code{AC_SYS_LARGEFILE}, +-but also declares that the program being configured +-requires support for large files. +-If a large @code{off_t} is unavailable, +-@command{configure} will error out. +-The @option{--disable-largefile} option will not be available. +- +-Large-file and year-2038 support for applications and libraries should +-be configured compatibly. @xref{AC_SYS_LARGEFILE}. +-@end defmac +- + @anchor{AC_SYS_LONG_FILE_NAMES} + @defmac AC_SYS_LONG_FILE_NAMES + @acindex{SYS_LONG_FILE_NAMES} +@@ -8927,14 +8916,13 @@ applications and libraries should be configured compatibly. + @xref{AC_SYS_LARGEFILE}. + @end defmac + +-@defmac AC_SYS_YEAR2038_REQUIRED +-@acindex{SYS_YEAR2038_REQUIRED} ++@defmac AC_SYS_YEAR2038_RECOMMENDED ++@acindex{SYS_YEAR2038_RECOMMENDED} + This macro has the same effect as @code{AC_SYS_YEAR2038}, + but also declares that the program being configured +-requires support for timestamps after mid-January of 2038. +-If a large @code{time_t} is unavailable, +-@command{configure} will unconditionally error out. +-The @option{--disable-year2038} option will not be available. ++should support timestamps after mid-January 2038. ++If a large @code{time_t} is unavailable, @command{configure} will error ++out unless the @option{--disable-year2038} option is specified. + + Year-2038 support for applications and libraries should be configured + compatibly. @xref{AC_SYS_YEAR2038}. +diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 +index f411695fe..88e0479e8 100644 +--- a/lib/autoconf/specific.m4 ++++ b/lib/autoconf/specific.m4 +@@ -115,8 +115,8 @@ m4_define([_AC_SYS_YEAR2038_OPTIONS], m4_normalize( + dnl 32-bit MinGW (misconfiguration) + )) + +-# _AC_SYS_YEAR2038_PROBE([IF-NOT-DETECTED]) +-# ----------------------------------------- ++# _AC_SYS_YEAR2038_PROBE ++# ---------------------- + # Subroutine of AC_SYS_YEAR2038. Probe for time_t that can represent + # time points more than 2**31 - 1 seconds after the epoch (dates after + # 2038-01-18, see above) and set the cache variable ac_cv_sys_year2038_opts +@@ -129,13 +129,10 @@ m4_define([_AC_SYS_YEAR2038_OPTIONS], m4_normalize( + # AC_TRY_RUN. Note also that some systems only support large time_t + # together with large off_t. + # +-# If support is not detected, the behavior depends on which of the +-# top-level AC_SYS_YEAR2038 macros was used (see below). +-# + # If you change this macro you may also need to change + # _AC_SYS_YEAR2038_OPTIONS. + AC_DEFUN([_AC_SYS_YEAR2038_PROBE], +-[AC_CACHE_CHECK([for $CC option to enable timestamps after Jan 2038], ++[AC_CACHE_CHECK([for $CC option for timestamps after 2038], + [ac_cv_sys_year2038_opts], + [ac_save_CPPFLAGS="$CPPFLAGS" + ac_opt_found=no +@@ -154,29 +151,7 @@ ac_have_year2038=yes + AS_CASE([$ac_cv_sys_year2038_opts], + ["none needed"], [], + ["support not detected"], +- [ac_have_year2038=no +- AS_CASE([$ac_year2038_required,$enable_year2038], +- [yes,*], +- [AC_MSG_FAILURE([support for timestamps after Jan 2038 is required])], +- [*,yes], +- [# If we're not cross compiling and 'touch' works with a large +- # timestamp, then we can presume the system supports wider time_t +- # *somehow* and we just weren't able to detect it. One common +- # case that we deliberately *don't* probe for is a system that +- # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers +- # wide time_t. (It would be inappropriate for us to override an +- # intentional use of -m32.) Error out, demanding use of +- # --disable-year2038 if this is intentional. +- AS_IF([test $cross_compiling = no], +- [AS_IF([TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null], +- [AS_CASE([`TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null`], +- [*'Feb 7 2106'* | *'Feb 7 17:10'*], +- [AC_MSG_FAILURE(m4_text_wrap( +- [this system appears to support timestamps after January 2038, +- but no mechanism for enabling wide 'time_t' was detected. +- Did you mean to build a 64-bit binary? (e.g. 'CC="${CC} -m64"'.) +- To proceed with 32-bit time_t, configure with '--disable-year2038'.], +- [], [], [55]))])])])])], ++ [ac_have_year2038=no], + + ["-D_TIME_BITS=64"], + [AC_DEFINE([_TIME_BITS], [64], +@@ -189,7 +164,7 @@ AS_CASE([$ac_cv_sys_year2038_opts], + ["-U_USE_32_BIT_TIME_T"*], + [AC_MSG_FAILURE(m4_text_wrap( + [the 'time_t' type is currently forced to be 32-bit. +- It will stop working after January 2038. ++ It will stop working after mid-January 2038. + Remove _USE_32BIT_TIME_T from the compiler flags.], + [], [], [55]))], + +@@ -199,44 +174,23 @@ AS_CASE([$ac_cv_sys_year2038_opts], + + # _AC_SYS_YEAR2038_ENABLE + # ----------------------- +-# Subroutine of AC_SYS_YEAR2038 and _AC_SYS_YEAR2038_OPT_IN. + # Depending on which of the YEAR2038 macros was used, add either an +-# --enable-year2038, or a --disable-year2038, or no option at all to +-# the configure script. Note that this is expanded very late and ++# --enable-year2038 or a --disable-year2038 to ++# the configure script. This is expanded very late and + # therefore there cannot be any code in the AC_ARG_ENABLE. The + # default value for 'enable_year2038' is emitted unconditionally + # because the generated code always looks at this variable. + m4_define([_AC_SYS_YEAR2038_ENABLE], + [m4_divert_text([DEFAULTS], +- m4_provide_if([AC_SYS_YEAR2038_REQUIRED], +- [ac_year2038_required=yes], +- [ac_year2038_required=no]))dnl +-m4_divert_text([DEFAULTS], + m4_provide_if([AC_SYS_YEAR2038], + [enable_year2038=yes], + [enable_year2038=no]))]dnl +-[m4_provide_if([AC_SYS_YEAR2038_REQUIRED], [], + [AC_ARG_ENABLE([year2038], + m4_provide_if([AC_SYS_YEAR2038], + [AS_HELP_STRING([--disable-year2038], +- [omit support for dates after Jan 2038])], ++ [don't support timestamps after 2038])], + [AS_HELP_STRING([--enable-year2038], +- [include support for dates after Jan 2038])]))])]) +- +-# _AC_SYS_YEAR2038_OPT_IN +-# ----------------------- +-# If the --enable-year2038 option is given to configure, attempt to +-# detect and activate support for large time_t on 32-bit systems. +-# This macro is automatically invoked by AC_SYS_LARGEFILE when large +-# *file* support is detected. It does not AC_REQUIRE AC_SYS_LARGEFILE +-# to avoid a dependency loop, and is therefore unsafe to expose as a +-# documented macro. +-AC_DEFUN([_AC_SYS_YEAR2038_OPT_IN], +-[m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl +- AS_IF([test "$ac_year2038_required,$enable_year2038" != no,no], +- [_AC_SYS_YEAR2038_PROBE]) +- AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE]) +-])]) ++ [support timestamps after 2038])]))]) + + # AC_SYS_YEAR2038 + # --------------- +@@ -244,28 +198,39 @@ AC_DEFUN([_AC_SYS_YEAR2038_OPT_IN], + # On systems where time_t is not always 64 bits, this probe can be + # skipped by passing the --disable-year2038 option to configure. + AC_DEFUN([AC_SYS_YEAR2038], +-[m4_provide_if([AC_SYS_LARGEFILE_REQUIRED], [], +- [AC_REQUIRE([AC_SYS_LARGEFILE])])]dnl +-[m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl +- AS_IF([test "$ac_year2038_required,$enable_year2038" != no,no], +- [_AC_SYS_YEAR2038_PROBE]) +- AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE]) +-])]) +- +-# AC_SYS_YEAR2038_REQUIRED +-# ------------------------ +-# Same as AC_SYS_YEAR2038, but declares that this program *requires* +-# support for large time_t. If we cannot find any way to make time_t +-# capable of representing values larger than 2**31 - 1, configure will +-# error out. Furthermore, no --enable-year2038 nor --disable-year2038 +-# option will be available. +-AC_DEFUN([AC_SYS_YEAR2038_REQUIRED], +-[m4_provide_if([AC_SYS_LARGEFILE_REQUIRED], [], +- [AC_REQUIRE([AC_SYS_LARGEFILE])])]dnl +-[m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl +- _AC_SYS_YEAR2038_PROBE +- AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE]) +-])]) ++[AC_REQUIRE([AC_SYS_LARGEFILE])dnl ++AS_IF([test "$enable_year2038,$ac_have_year2038,$cross_compiling" = yes,no,no], ++ [# If we're not cross compiling and 'touch' works with a large ++ # timestamp, then we can presume the system supports wider time_t ++ # *somehow* and we just weren't able to detect it. One common ++ # case that we deliberately *don't* probe for is a system that ++ # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers ++ # wide time_t. (It would be inappropriate for us to override an ++ # intentional use of -m32.) Error out, demanding use of ++ # --disable-year2038 if this is intentional. ++ AS_IF([TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null], ++ [AS_CASE([`TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null`], ++ [*'Feb 7 2106'* | *'Feb 7 17:10'*], ++ [AC_MSG_FAILURE(m4_text_wrap( ++ [this system appears to support timestamps after mid-January 2038, ++ but no mechanism for enabling wide 'time_t' was detected. ++ Did you mean to build a 64-bit binary? (E.g., 'CC="${CC} -m64"'.) ++ To proceed with 32-bit time_t, configure with '--disable-year2038'.], ++ [], [], [55]))])])])]) ++ ++# AC_SYS_YEAR2038_RECOMMENDED ++# --------------------------- ++# Same as AC_SYS_YEAR2038, but recommend support for large time_t. ++# If we cannot find any way to make time_t capable of representing ++# values larger than 2**31 - 1, error out unless --disable-year2038 is given. ++AC_DEFUN([AC_SYS_YEAR2038_RECOMMENDED], ++[AC_REQUIRE([AC_SYS_YEAR2038])dnl ++AS_IF([test "$enable_year2038,$ac_have_year2038" = yes,no], ++ [AC_MSG_FAILURE(m4_text_wrap( ++ [could not enable timestamps after mid-January 2038. ++ Did you mean to build a 64-bit binary? (E.g., 'CC="${CC} -m64"'.) ++ To proceed with 32-bit time_t, configure with '--disable-year2038'.], ++ [], [], [55]))])]) + + # _AC_SYS_LARGEFILE_TEST_CODE + # --------------------------- +@@ -342,9 +307,7 @@ AS_CASE([$ac_cv_sys_largefile_opts], + ["none needed"], [], + ["supported through gnulib"], [], + ["support not detected"], +- [ac_have_largefile=no +- AS_IF([test $ac_largefile_required,$ac_year2038_required != no,no], +- [AC_MSG_FAILURE([support for large files is required])])], ++ [ac_have_largefile=no], + + ["-D_FILE_OFFSET_BITS=64"], + [AC_DEFINE([_FILE_OFFSET_BITS], [64], +@@ -360,30 +323,9 @@ AS_CASE([$ac_cv_sys_largefile_opts], + [AC_MSG_ERROR( + [internal error: bad value for \$ac_cv_sys_largefile_opts])]) + +-_AC_SYS_YEAR2038_OPT_IN +-]) +- +-# _AC_SYS_LARGEFILE_ENABLE +-# ------------------------ +-# Subroutine of AC_SYS_LARGEFILE. If AC_SYS_LARGEFILE_REQUIRED was +-# not used at any point in this configure script, add a +-# --disable-largefile option to the configure script. Note that this +-# is expanded very late and therefore there cannot be any code in the +-# AC_ARG_ENABLE. The default value for 'enable_largefile' is emitted +-# unconditionally because the generated shell code always looks at +-# this variable. +-m4_define([_AC_SYS_LARGEFILE_ENABLE], +-[m4_divert_text([DEFAULTS], +- m4_provide_if([AC_SYS_LARGEFILE_REQUIRED], +- [ac_largefile_required=yes], +- [ac_largefile_required=no]))dnl +-m4_divert_text([DEFAULTS], +- [enable_largefile=yes])]dnl +-[m4_provide_if([AC_SYS_LARGEFILE_REQUIRED], [], +- [m4_provide_if([AC_SYS_YEAR2038_REQUIRED], [], +- [AC_ARG_ENABLE([largefile], +- [AS_HELP_STRING([--disable-largefile], +- [omit support for large files])])])])]) ++AS_IF([test "$enable_year2038" != no], ++ [_AC_SYS_YEAR2038_PROBE]) ++AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE])]) + + # AC_SYS_LARGEFILE + # ---------------- +@@ -394,29 +336,12 @@ m4_divert_text([DEFAULTS], + # Additionally, on Linux file systems with 64-bit inodes a file that happens + # to have a 64-bit inode number cannot be accessed by 32-bit applications on + # Linux x86/x86_64. This can occur with file systems such as XFS and NFS. +-# This macro allows configuration to continue if the system doesn't support +-# large files; see also AC_SYS_LARGEFILE_REQUIRED. + AC_DEFUN([AC_SYS_LARGEFILE], +-[m4_provide_if([_AC_SYS_LARGEFILE_PROBE], [], [dnl +- AS_IF([test "$ac_largefile_required,$enable_largefile,$ac_year2038_required" != no,no,no], +- [_AC_SYS_LARGEFILE_PROBE]) +- AC_CONFIG_COMMANDS_PRE([_AC_SYS_LARGEFILE_ENABLE]) +-])]) +- +-# AC_SYS_LARGEFILE_REQUIRED +-# ------------------------- +-# Same as AC_SYS_LARGEFILE, but declares that this program *requires* +-# support for large files. If we cannot find a combination of compiler +-# options and #defines that makes 'off_t' capable of representing 2**63 - 1, +-# 'configure' will error out. Furthermore, 'configure' will not offer a +-# --disable-largefile command line option. +-# If both AC_SYS_LARGEFILE and AC_SYS_LARGEFILE_REQUIRED are used in the +-# same configure script -- in either order -- AC_SYS_LARGEFILE_REQUIRED wins. +-AC_DEFUN([AC_SYS_LARGEFILE_REQUIRED], +-[m4_provide_if([_AC_SYS_LARGEFILE_PROBE], [], [dnl +- _AC_SYS_LARGEFILE_PROBE +- AC_CONFIG_COMMANDS_PRE([_AC_SYS_LARGEFILE_ENABLE]) +-])]) ++[AC_ARG_ENABLE([largefile], ++ [AS_HELP_STRING([--disable-largefile], ++ [omit support for large files])])dnl ++AS_IF([test "$enable_largefile,$enable_year2038" != no,no], ++ [_AC_SYS_LARGEFILE_PROBE])]) + + # AC_SYS_LONG_FILE_NAMES + # ---------------------- +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0021-Port-AC_FUNC_MMAP-to-more-modern-systems.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0021-Port-AC_FUNC_MMAP-to-more-modern-systems.patch new file mode 100644 index 0000000000..56bcbb6ca1 --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0021-Port-AC_FUNC_MMAP-to-more-modern-systems.patch @@ -0,0 +1,98 @@ +From 028526149ee804617a302ccef22cc6adbda681b0 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Wed, 10 May 2023 17:20:49 -0700 +Subject: [PATCH 21/29] Port AC_FUNC_MMAP to more-modern systems +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* lib/autoconf/functions.m4 (AC_FUNC_MMAP): Don’t call +getpagesize, as it’s tricky to configure, modern POSIX doesn’t +require it, and calling it without including <unistd.h> provokes a +compile-time error on modern systems. Instead, rework the test +to not need getpagesize. Add a FIXME comment for unnecessary +tests; I don't want to remove them now as we're too close to +a release. Remove long-obsolete comment about GNU grep. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/autoconf/functions.m4 | 44 +++++---------------------------------- + 1 file changed, 5 insertions(+), 39 deletions(-) + +diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4 +index 499e4c024..5a0f01856 100644 +--- a/lib/autoconf/functions.m4 ++++ b/lib/autoconf/functions.m4 +@@ -1283,6 +1283,7 @@ AU_ALIAS([AM_FUNC_MKTIME], [AC_FUNC_MKTIME]) + AN_FUNCTION([mmap], [AC_FUNC_MMAP]) + AC_DEFUN([AC_FUNC_MMAP], + [AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles ++dnl FIXME: Remove the unnecessary checks for unistd.h, sys/param.h, getpagesize. + AC_CHECK_HEADERS_ONCE([unistd.h sys/param.h]) + AC_CHECK_FUNCS_ONCE([getpagesize]) + AC_CACHE_CHECK([for working mmap], [ac_cv_func_mmap_fixed_mapped], +@@ -1305,48 +1306,11 @@ AC_CACHE_CHECK([for working mmap], [ac_cv_func_mmap_fixed_mapped], + VM page cache was not coherent with the file system buffer cache + like early versions of FreeBSD and possibly contemporary NetBSD.) + For shared mappings, we should conversely verify that changes get +- propagated back to all the places they're supposed to be. +- +- Grep wants private fixed already mapped. +- The main things grep needs to know about mmap are: +- * does it exist and is it safe to write into the mmap'd area +- * how to use it (BSD variants) */ ++ propagated back to all the places they're supposed to be. */ + + #include <fcntl.h> + #include <sys/mman.h> + +-/* This mess was copied from the GNU getpagesize.h. */ +-#ifndef HAVE_GETPAGESIZE +-# ifdef _SC_PAGESIZE +-# define getpagesize() sysconf(_SC_PAGESIZE) +-# else /* no _SC_PAGESIZE */ +-# ifdef HAVE_SYS_PARAM_H +-# include <sys/param.h> +-# ifdef EXEC_PAGESIZE +-# define getpagesize() EXEC_PAGESIZE +-# else /* no EXEC_PAGESIZE */ +-# ifdef NBPG +-# define getpagesize() NBPG * CLSIZE +-# ifndef CLSIZE +-# define CLSIZE 1 +-# endif /* no CLSIZE */ +-# else /* no NBPG */ +-# ifdef NBPC +-# define getpagesize() NBPC +-# else /* no NBPC */ +-# ifdef PAGESIZE +-# define getpagesize() PAGESIZE +-# endif /* PAGESIZE */ +-# endif /* no NBPC */ +-# endif /* no NBPG */ +-# endif /* no EXEC_PAGESIZE */ +-# else /* no HAVE_SYS_PARAM_H */ +-# define getpagesize() 8192 /* punt totally */ +-# endif /* no HAVE_SYS_PARAM_H */ +-# endif /* no _SC_PAGESIZE */ +- +-#endif /* no HAVE_GETPAGESIZE */ +- + int + main (void) + { +@@ -1355,7 +1319,9 @@ main (void) + int i, pagesize; + int fd, fd2; + +- pagesize = getpagesize (); ++ /* The "page size" need not equal the system page size, ++ and need not even be a power of 2. */ ++ pagesize = 8192; + + /* First, make a file with some known garbage in it. */ + data = (char *) malloc (pagesize); +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0022-Fix-port-of-AC_FUNC_MMAP.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0022-Fix-port-of-AC_FUNC_MMAP.patch new file mode 100644 index 0000000000..1b168c7b55 --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0022-Fix-port-of-AC_FUNC_MMAP.patch @@ -0,0 +1,91 @@ +From 33c26d2700f927432c756ccf7a4fc89403d35b95 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Wed, 10 May 2023 22:57:27 -0700 +Subject: [PATCH 22/29] Fix port of AC_FUNC_MMAP +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Matt Turner in: +https://lists.gnu.org/r/bug-autoconf/2023-05/msg00005.html +* lib/autoconf/functions.m4 (AC_FUNC_MMAP): Go back to getting the +page size, since the zero-fill test needs this after all. +However, prefer sysconf (_SC_PAGESIZE) or sysconf (_SC_PAGE_SIZE) +to getpagesize (), and use ‘long’ not ‘int’ to store the page size. +Also, declare getpagesize if it is used as a function. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/autoconf/functions.m4 | 41 ++++++++++++++++++++++++++++++++++----- + 1 file changed, 36 insertions(+), 5 deletions(-) + +diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4 +index 5a0f01856..3d6e4aca8 100644 +--- a/lib/autoconf/functions.m4 ++++ b/lib/autoconf/functions.m4 +@@ -1283,7 +1283,6 @@ AU_ALIAS([AM_FUNC_MKTIME], [AC_FUNC_MKTIME]) + AN_FUNCTION([mmap], [AC_FUNC_MMAP]) + AC_DEFUN([AC_FUNC_MMAP], + [AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles +-dnl FIXME: Remove the unnecessary checks for unistd.h, sys/param.h, getpagesize. + AC_CHECK_HEADERS_ONCE([unistd.h sys/param.h]) + AC_CHECK_FUNCS_ONCE([getpagesize]) + AC_CACHE_CHECK([for working mmap], [ac_cv_func_mmap_fixed_mapped], +@@ -1311,17 +1310,49 @@ AC_CACHE_CHECK([for working mmap], [ac_cv_func_mmap_fixed_mapped], + #include <fcntl.h> + #include <sys/mman.h> + ++#ifndef getpagesize ++# ifdef _SC_PAGESIZE ++# define getpagesize() sysconf (_SC_PAGESIZE) ++# elif defined _SC_PAGE_SIZE ++# define getpagesize() sysconf (_SC_PAGE_SIZE) ++# elif HAVE_GETPAGESIZE ++int getpagesize (); ++# else ++# ifdef HAVE_SYS_PARAM_H ++# include <sys/param.h> ++# ifdef EXEC_PAGESIZE ++# define getpagesize() EXEC_PAGESIZE ++# else /* no EXEC_PAGESIZE */ ++# ifdef NBPG ++# define getpagesize() NBPG * CLSIZE ++# ifndef CLSIZE ++# define CLSIZE 1 ++# endif /* no CLSIZE */ ++# else /* no NBPG */ ++# ifdef NBPC ++# define getpagesize() NBPC ++# else /* no NBPC */ ++# ifdef PAGESIZE ++# define getpagesize() PAGESIZE ++# endif /* PAGESIZE */ ++# endif /* no NBPC */ ++# endif /* no NBPG */ ++# endif /* no EXEC_PAGESIZE */ ++# else /* no HAVE_SYS_PARAM_H */ ++# define getpagesize() 8192 /* punt totally */ ++# endif /* no HAVE_SYS_PARAM_H */ ++# endif ++#endif ++ + int + main (void) + { + char *data, *data2, *data3; + const char *cdata2; +- int i, pagesize; ++ long i, pagesize; + int fd, fd2; + +- /* The "page size" need not equal the system page size, +- and need not even be a power of 2. */ +- pagesize = 8192; ++ pagesize = getpagesize (); + + /* First, make a file with some known garbage in it. */ + data = (char *) malloc (pagesize); +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0023-Improve-AC_SYS_YEAR2038_RECOMMENDED-diagnostic.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0023-Improve-AC_SYS_YEAR2038_RECOMMENDED-diagnostic.patch new file mode 100644 index 0000000000..9fb33c3196 --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0023-Improve-AC_SYS_YEAR2038_RECOMMENDED-diagnostic.patch @@ -0,0 +1,38 @@ +From ccc0d640c4d829504568330f9674408af5092ffc Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Sat, 13 May 2023 09:56:33 -0700 +Subject: [PATCH 23/29] Improve AC_SYS_YEAR2038_RECOMMENDED diagnostic + +* lib/autoconf/specific.m4 (AC_SYS_YEAR2038_RECOMMENDED): +Do not recommend gcc -m64, as that likely will not work. +Problem reported by Bruno Haible in: +https://lists.gnu.org/r/bug-gnulib/2023-05/msg00060.html +Instead, mention that 32-bit time_t is not recommended +for this package, before telling the builder how +to configure with 32-bit time_t anyway. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/autoconf/specific.m4 | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 +index 88e0479e8..91f20bf0d 100644 +--- a/lib/autoconf/specific.m4 ++++ b/lib/autoconf/specific.m4 +@@ -228,8 +228,9 @@ AC_DEFUN([AC_SYS_YEAR2038_RECOMMENDED], + AS_IF([test "$enable_year2038,$ac_have_year2038" = yes,no], + [AC_MSG_FAILURE(m4_text_wrap( + [could not enable timestamps after mid-January 2038. +- Did you mean to build a 64-bit binary? (E.g., 'CC="${CC} -m64"'.) +- To proceed with 32-bit time_t, configure with '--disable-year2038'.], ++ This package recommends support for these later timestamps. ++ However, to proceed with signed 32-bit time_t even though it ++ will fail then, configure with '--disable-year2038'.], + [], [], [55]))])]) + + # _AC_SYS_LARGEFILE_TEST_CODE +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0024-Improve-AC_FUNC_MMAP-comments.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0024-Improve-AC_FUNC_MMAP-comments.patch new file mode 100644 index 0000000000..2644c57836 --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0024-Improve-AC_FUNC_MMAP-comments.patch @@ -0,0 +1,29 @@ +From 8e7281d7bebb5e389befe6e9a5afbb7b2ae13ae0 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Wed, 17 May 2023 11:50:27 -0700 +Subject: [PATCH 24/29] Improve AC_FUNC_MMAP comments + +* lib/autoconf/functions.m4 (AC_FUNC_MMAP): Add comment. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/autoconf/functions.m4 | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4 +index 3d6e4aca8..54d04cc38 100644 +--- a/lib/autoconf/functions.m4 ++++ b/lib/autoconf/functions.m4 +@@ -1311,6 +1311,8 @@ AC_CACHE_CHECK([for working mmap], [ac_cv_func_mmap_fixed_mapped], + #include <sys/mman.h> + + #ifndef getpagesize ++/* Prefer sysconf to the legacy getpagesize function, as getpagesize has ++ been removed from POSIX and is limited to page sizes that fit in 'int'. */ + # ifdef _SC_PAGESIZE + # define getpagesize() sysconf (_SC_PAGESIZE) + # elif defined _SC_PAGE_SIZE +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0025-Fix-AC_SYS_LARGEFILE-on-GNU-Linux-alpha-s390x.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0025-Fix-AC_SYS_LARGEFILE-on-GNU-Linux-alpha-s390x.patch new file mode 100644 index 0000000000..b7affed40d --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0025-Fix-AC_SYS_LARGEFILE-on-GNU-Linux-alpha-s390x.patch @@ -0,0 +1,62 @@ +From 103514e40da5f20aebf83a3446452ccebe5172bb Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Mon, 19 Jun 2023 14:04:29 -0700 +Subject: [PATCH 25/29] Fix AC_SYS_LARGEFILE on GNU/Linux alpha, s390x + +Problem reported by Matoro <https://bugs.gnu.org/64123>. +* lib/autoconf/specific.m4 (_AC_SYS_LARGEFILE_TEST_CODE): +New overridable macro FTYPE, to test types other than off_t. +(_AC_SYS_LARGEFILE_TEST_CODE): Test ino_t for +-D_FILE_OFFSETBITS=64 too, if no flags are needed for off_t. +Needed for GNU/Linux on alpha and s390x. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/autoconf/specific.m4 | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 +index 91f20bf0d..9d5974548 100644 +--- a/lib/autoconf/specific.m4 ++++ b/lib/autoconf/specific.m4 +@@ -238,13 +238,16 @@ AS_IF([test "$enable_year2038,$ac_have_year2038" = yes,no], + # C code used to probe for large file support. + m4_define([_AC_SYS_LARGEFILE_TEST_CODE], + [@%:@include <sys/types.h> +- /* Check that off_t can represent 2**63 - 1 correctly. +- We can't simply define LARGE_OFF_T to be 9223372036854775807, ++@%:@ifndef FTYPE ++@%:@ define FTYPE off_t ++@%:@endif ++ /* Check that FTYPE can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_FTYPE to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +-@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) +- int off_t_is_large[[(LARGE_OFF_T % 2147483629 == 721 +- && LARGE_OFF_T % 2147483647 == 1) ++@%:@define LARGE_FTYPE (((FTYPE) 1 << 31 << 31) - 1 + ((FTYPE) 1 << 31 << 31)) ++ int FTYPE_is_large[[(LARGE_FTYPE % 2147483629 == 721 ++ && LARGE_FTYPE % 2147483647 == 1) + ? 1 : -1]];[]dnl + ]) + # Defined by Autoconf 2.71 and circa 2022 Gnulib unwisely depended on it. +@@ -284,7 +287,13 @@ AC_DEFUN([_AC_SYS_LARGEFILE_PROBE], + AS_IF([test x"$ac_opt" != x"none needed"], + [CC="$ac_save_CC $ac_opt"]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_CODE])], +- [ac_cv_sys_largefile_opts="$ac_opt" ++ [AS_IF([test x"$ac_opt" = x"none needed"], ++ [# GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t. ++ CC="$CC -DFTYPE=ino_t" ++ AC_COMPILE_IFELSE([], [], ++ [CC="$CC -D_FILE_OFFSET_BITS=64" ++ AC_COMPILE_IFELSE([], [ac_opt='-D_FILE_OFFSET_BITS=64'])])]) ++ ac_cv_sys_largefile_opts=$ac_opt + ac_opt_found=yes]) + test $ac_opt_found = no || break + done +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0026-Modernize-INSTALL.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0026-Modernize-INSTALL.patch new file mode 100644 index 0000000000..8d2539611d --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0026-Modernize-INSTALL.patch @@ -0,0 +1,270 @@ +From a7421b411b4359b97528c8f4e9dd8abe82235813 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Tue, 20 Jun 2023 13:23:19 -0700 +Subject: [PATCH 26/29] Modernize INSTALL + +Problem reported for gettext bootstrap by Julien Palard in: +https://savannah.gnu.org/bugs/?62196 +* doc/install.texi: Give a brief info as to how to bootstrap, +on packages built from Git rather from a distribution tarball. +Remove aging details about c99, macOS, X, HP-UX, OSF/1, Solaris, +Haiku, sun4. Improve documentation for enable/disable and +with/without options. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + doc/install.texi | 157 +++++++++++++++++++++-------------------------- + 1 file changed, 70 insertions(+), 87 deletions(-) + +diff --git a/doc/install.texi b/doc/install.texi +index e06689613..cec245fd0 100644 +--- a/doc/install.texi ++++ b/doc/install.texi +@@ -18,9 +18,21 @@ warranty of any kind. + @node Basic Installation + @section Basic Installation + +-Briefly, the shell command +-@samp{./configure@tie{}&& make@tie{}&& make@tie{}install} +-should configure, build, and install this package. The following ++Briefly, the following shell commands: ++ ++@example ++test -f configure || ./bootstrap ++./configure ++make ++make install ++@end example ++ ++@noindent ++should configure, build, and install this package. ++The @command{./bootstrap} line is intended for developers; ++you can omit it when building from a distribution tarball. ++ ++The following + more-detailed instructions are generic; see the @file{README} file for + instructions specific to this package. + @ifclear autoconf +@@ -32,6 +44,17 @@ More recommendations for GNU packages can be found in + @ref{Makefile Conventions, , Makefile Conventions, standards, + GNU Coding Standards}. + ++If the @command{bootstrap} shell script exists, it attempts to build the ++@command{configure} shell script and related files, perhaps by ++downloading other software components from the network, and by using ++developer tools that are less commonly installed. Because the output of ++@command{bootstrap} is system-independent, it is normally run by a ++package developer so that its output can be put into the distribution ++tarball and ordinary builders and users need not run @command{bootstrap}. ++Some packages have commands like @command{./autopull.sh} and ++@command {./autogen.sh} that you can run instead of @command{./bootstrap}, ++for more fine-grained control over bootstrapping. ++ + The @command{configure} shell script attempts to guess correct values + for various system-dependent variables used during compilation. It uses + those values to create a @file{Makefile} in each directory of the +@@ -63,8 +86,15 @@ The simplest way to compile this package is: + + @enumerate + @item +-@command{cd} to the directory containing the package's source code and type +-@samp{./configure} to configure the package for your system. ++@command{cd} to the directory containing the package's source code. ++ ++@item ++If this is a developer checkout and file @samp{configure} does not yet exist, ++type @samp{./bootstrap} to create it. ++You may need special developer tools and network access to bootstrap. ++ ++@item ++Type @samp{./configure} to configure the package for your system. + + Running @command{configure} might take a while. While running, it prints some + messages telling which features it is checking for. +@@ -124,7 +154,7 @@ parameters by setting variables in the command line or in the environment. + Here is an example: + + @example +-./configure CC=c99 CFLAGS=-g LIBS=-lposix ++./configure CC=gcc CFLAGS=-g LIBS=-lposix + @end example + + @xref{Defining Variables}, for more details. +@@ -148,21 +178,10 @@ architecture at a time in the source code directory. After you have + installed the package for one architecture, use @samp{make distclean} + before reconfiguring for another architecture. + +-On MacOS X 10.5 and later systems, you can create libraries and +-executables that work on multiple system types---known as @dfn{fat} or +-@dfn{universal} binaries---by specifying multiple @option{-arch} options +-to the compiler but only a single @option{-arch} option to the +-preprocessor. Like this: +- +-@example +-./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ +- CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ +- CPP="gcc -E" CXXCPP="g++ -E" +-@end example +- +-This is not guaranteed to produce working output in all cases, you may +-have to build one architecture at a time and combine the results +-using the @command{lipo} tool if you have problems. ++Some platforms, notably macOS, support ``fat'' or ``universal'' binaries, ++where a single binary can execute on different architectures. ++On these platforms you can configure and compile just once, ++with options specific to that platform. + + @node Installation Names + @section Installation Names +@@ -227,20 +246,16 @@ an extra prefix or suffix on their names by giving @command{configure} + the option @option{--program-prefix=@var{PREFIX}} or + @option{--program-suffix=@var{SUFFIX}}. + +-Some packages pay attention to @option{--enable-@var{feature}} options ++Some packages pay attention to @option{--enable-@var{feature}} ++and @option{--disable-@var{feature}} options + to @command{configure}, where @var{feature} indicates an optional part + of the package. They may also pay attention to +-@option{--with-@var{package}} options, where @var{package} is something +-like @samp{gnu-as} or @samp{x} (for the X Window System). The +-@file{README} should mention any @option{--enable-} and @option{--with-} ++@option{--with-@var{package}} and @option{--without-@var{package}} options, ++where @var{package} is something like @samp{gnu-ld}. ++@samp{./configure --help} should mention the ++@option{--enable-...} and @option{--with-...} + options that the package recognizes. + +-For packages that use the X Window System, @command{configure} can +-usually find the X include and library files automatically, but if it +-doesn't, you can use the @command{configure} options +-@option{--x-includes=@var{dir}} and @option{--x-libraries=@var{dir}} to +-specify their locations. +- + Some packages offer the ability to configure how verbose the execution + of @command{make} will be. For these packages, running + @samp{./configure --enable-silent-rules} sets the default to minimal +@@ -248,53 +263,6 @@ output, which can be overridden with @code{make V=1}; while running + @samp{./configure --disable-silent-rules} sets the default to verbose, + which can be overridden with @code{make V=0}. + +-@node Particular Systems +-@section Particular systems +- +-On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC is +-not installed, it is recommended to use the following options in order to +-use an ANSI C compiler: +- +-@example +-./configure CC="cc -Ae -D_XOPEN_SOURCE=500" +-@end example +- +-@noindent +-and if that doesn't work, install pre-built binaries of GCC for HP-UX. +- +-HP-UX @command{make} updates targets which have the same timestamps as +-their prerequisites, which makes it generally unusable when shipped +-generated files such as @command{configure} are involved. Use GNU +-@command{make} instead. +- +-On OSF/1 a.k.a.@: Tru64, some versions of the default C compiler cannot +-parse its @code{<wchar.h>} header file. The option @option{-nodtk} can be +-used as a workaround. If GNU CC is not installed, it is therefore +-recommended to try +- +-@example +-./configure CC="cc" +-@end example +- +-@noindent +-and if that doesn't work, try +- +-@example +-./configure CC="cc -nodtk" +-@end example +- +-On Solaris, don't put @code{/usr/ucb} early in your @env{PATH}. This +-directory contains several dysfunctional programs; working variants +-of these programs are available in @code{/usr/bin}. So, if you need +-@code{/usr/ucb} in your @env{PATH}, put it @emph{after} @code{/usr/bin}. +- +-On Haiku, software installed for all users goes in @file{/boot/common}, +-not @file{/usr/local}. It is recommended to use the following options: +- +-@example +-./configure --prefix=/boot/common +-@end example +- + @node System Type + @section Specifying the System Type + +@@ -304,7 +272,8 @@ will run on. Usually, assuming the package is built to be run on the + @emph{same} architectures, @command{configure} can figure that out, but + if it prints a message saying it cannot guess the machine type, give it + the @option{--build=@var{type}} option. @var{type} can either be a +-short name for the system type, such as @samp{sun4}, or a canonical name ++short name like @samp{mingw64} for the system type, or a canonical name ++like @samp{x86_64-pc-linux-gnu} + which has the form: + + @example +@@ -319,6 +288,7 @@ where @var{system} can have one of these forms: + @var{kernel}-@var{os} + @end example + ++@noindent + See the file @file{config.sub} for the possible values of each field. + If @file{config.sub} isn't included in this package, then this package + doesn't need to know the machine type. +@@ -405,13 +375,6 @@ traditionally @file{config.cache}. @var{file} defaults to + @itemx -C + Alias for @option{--cache-file=config.cache}. + +-@item --quiet +-@itemx --silent +-@itemx -q +-Do not print messages saying which checks are being made. To suppress +-all normal output, redirect it to @file{/dev/null} (any error messages +-will still be shown). +- + @item --srcdir=@var{dir} + Look for the package's source code in directory @var{dir}. Usually + @command{configure} can determine that directory automatically. +@@ -421,13 +384,33 @@ Use @var{dir} as the installation prefix. @ref{Installation Names} + for more details, including other options available for fine-tuning + the installation locations. + ++@item --build=@var{type} ++Build for architecture @var{type}. @ref{Specifying the System Type} ++for more details, including other system type options. ++ ++@item --enable-@var{feature} ++@itemx --disable-@var{feature} ++Enable or disable the optional @var{feature}. @xref{Optional Features}. ++ ++@item --with-@var{package} ++@itemx --without-@var{package} ++Use or omit @var{package} when building. @xref{Optional Features}. ++ ++@item --quiet ++@itemx --silent ++@itemx -q ++Do not print messages saying which checks are being made. To suppress ++all normal output, redirect it to @file{/dev/null} (any error messages ++will still be shown). ++ + @item --no-create + @itemx -n + Run the configure checks, but stop before creating any output files. + @end table + + @noindent +-@command{configure} also accepts some other, not widely useful, options. ++@command{configure} also recognizes several environment variables, ++and accepts some other, less widely useful, options. + Run @samp{configure --help} for more details. + + @c Local Variables: +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0027-doc-fix-broken-cross-refs.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0027-doc-fix-broken-cross-refs.patch new file mode 100644 index 0000000000..7ab5074755 --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0027-doc-fix-broken-cross-refs.patch @@ -0,0 +1,58 @@ +From eaea61e4485cdecf989fa777ff4e166c945a6eea Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Tue, 20 Jun 2023 13:39:15 -0700 +Subject: [PATCH 27/29] doc: fix broken cross-refs + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + doc/autoconf.texi | 5 +---- + doc/install.texi | 2 +- + 2 files changed, 2 insertions(+), 5 deletions(-) + +diff --git a/doc/autoconf.texi b/doc/autoconf.texi +index 0f3047b31..7817fc1b5 100644 +--- a/doc/autoconf.texi ++++ b/doc/autoconf.texi +@@ -604,7 +604,6 @@ Running @command{configure} Scripts + * Multiple Architectures:: Compiling for multiple architectures at once + * Installation Names:: Installing in different directories + * Optional Features:: Selecting optional features +-* Particular Systems:: Particular systems + * System Type:: Specifying the system type + * Sharing Defaults:: Setting site-wide defaults for @command{configure} + * Defining Variables:: Specifying the compiler etc. +@@ -23304,7 +23303,6 @@ may use comes with Autoconf. + * Multiple Architectures:: Compiling for multiple architectures at once + * Installation Names:: Installing in different directories + * Optional Features:: Selecting optional features +-* Particular Systems:: Particular systems + * System Type:: Specifying the system type + * Sharing Defaults:: Setting site-wide defaults for @command{configure} + * Defining Variables:: Specifying the compiler etc. +@@ -26990,8 +26988,7 @@ for simple differences. + @item + Most tests which produce their result in a substituted variable allow to + override the test by setting the variable on the @command{configure} +-command line (@pxref{Compilers and Options}, @pxref{Defining Variables}, +-@pxref{Particular Systems}). ++command line (@pxref{Compilers and Options}, @pxref{Defining Variables}). + + @item + Many tests store their result in a cache variable (@pxref{Caching +diff --git a/doc/install.texi b/doc/install.texi +index cec245fd0..6d9788fa9 100644 +--- a/doc/install.texi ++++ b/doc/install.texi +@@ -385,7 +385,7 @@ for more details, including other options available for fine-tuning + the installation locations. + + @item --build=@var{type} +-Build for architecture @var{type}. @ref{Specifying the System Type} ++Build for architecture @var{type}. @ref{System Type}. + for more details, including other system type options. + + @item --enable-@var{feature} +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0028-INSTALL-Clarify-build-host-target-and-the-system-typ.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0028-INSTALL-Clarify-build-host-target-and-the-system-typ.patch new file mode 100644 index 0000000000..95ad80df5e --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0028-INSTALL-Clarify-build-host-target-and-the-system-typ.patch @@ -0,0 +1,224 @@ +From 328f9b88ef896e8e31818c50d9ec2ade5c892ea4 Mon Sep 17 00:00:00 2001 +From: Bruno Haible <bruno@clisp.org> +Date: Fri, 23 Jun 2023 17:37:35 +0200 +Subject: [PATCH 28/29] INSTALL: Clarify --build, --host, --target, and the + system types. + +* doc/install.texi (Compilers and Options): Add another reference. +(System Types): Renamed from System Type. Explain how to canonicalize +and how to validate a system type. Don't explain --build, --host, +--target here. +(Building for a different system type): New section. +(Troubleshooting the Build Type): New section. +(Configuring a Compiler): New section. +(configure Invocation): Mention the --host option, not the --build +option, since --build is so rarely needed. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + doc/autoconf.texi | 6 +-- + doc/install.texi | 132 +++++++++++++++++++++++++++++++++++++--------- + 2 files changed, 111 insertions(+), 27 deletions(-) + +diff --git a/doc/autoconf.texi b/doc/autoconf.texi +index 7817fc1b5..043f7fb21 100644 +--- a/doc/autoconf.texi ++++ b/doc/autoconf.texi +@@ -604,7 +604,7 @@ Running @command{configure} Scripts + * Multiple Architectures:: Compiling for multiple architectures at once + * Installation Names:: Installing in different directories + * Optional Features:: Selecting optional features +-* System Type:: Specifying the system type ++* System Types:: Specifying a system type + * Sharing Defaults:: Setting site-wide defaults for @command{configure} + * Defining Variables:: Specifying the compiler etc. + * configure Invocation:: Changing how @command{configure} runs +@@ -22383,7 +22383,7 @@ system it's running on. To do so it runs a script called + command or symbols predefined by the C preprocessor. + + Alternately, the user can specify the system type with command line +-arguments to @command{configure} (@pxref{System Type}. Doing so is ++arguments to @command{configure} (@pxref{System Types}. Doing so is + necessary when + cross-compiling. In the most complex case of cross-compiling, three + system types are involved. The options to specify them are: +@@ -23303,7 +23303,7 @@ may use comes with Autoconf. + * Multiple Architectures:: Compiling for multiple architectures at once + * Installation Names:: Installing in different directories + * Optional Features:: Selecting optional features +-* System Type:: Specifying the system type ++* System Types:: Specifying a system type + * Sharing Defaults:: Setting site-wide defaults for @command{configure} + * Defining Variables:: Specifying the compiler etc. + * configure Invocation:: Changing how @command{configure} runs +diff --git a/doc/install.texi b/doc/install.texi +index 6d9788fa9..a3ef17828 100644 +--- a/doc/install.texi ++++ b/doc/install.texi +@@ -157,8 +157,16 @@ Here is an example: + ./configure CC=gcc CFLAGS=-g LIBS=-lposix + @end example + +-@xref{Defining Variables}, for more details. +- ++See ++@ref{Defining Variables} and ++@ifset autoconf ++@ref{Preset Output Variables} ++@end ifset ++@ifclear autoconf ++@ref{Preset Output Variables,,, autoconf, Autoconf} ++@c (@url{https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.71/html_node/Preset-Output-Variables.html}) ++@end ifclear ++for more details. + + @node Multiple Architectures + @section Compiling For Multiple Architectures +@@ -263,18 +271,17 @@ output, which can be overridden with @code{make V=1}; while running + @samp{./configure --disable-silent-rules} sets the default to verbose, + which can be overridden with @code{make V=0}. + +-@node System Type +-@section Specifying the System Type ++@node System Types ++@section Specifying a System Type + +-There may be some features @command{configure} cannot figure out +-automatically, but needs to determine by the type of machine the package +-will run on. Usually, assuming the package is built to be run on the +-@emph{same} architectures, @command{configure} can figure that out, but +-if it prints a message saying it cannot guess the machine type, give it +-the @option{--build=@var{type}} option. @var{type} can either be a +-short name like @samp{mingw64} for the system type, or a canonical name +-like @samp{x86_64-pc-linux-gnu} +-which has the form: ++The following sections go into details regarding situations where you ++may have to specify a system type, either through the option ++@option{--host=@var{type}}, or through the option ++@option{--build=@var{type}}, or -- in the case of compilers -- through ++@option{--target=@var{type}}. ++ ++A system type @var{type} can either be a short name like @samp{mingw64}, ++or a canonical name like @samp{x86_64-pc-linux-gnu} which has the form: + + @example + @var{cpu}-@var{company}-@var{system} +@@ -291,16 +298,93 @@ where @var{system} can have one of these forms: + @noindent + See the file @file{config.sub} for the possible values of each field. + If @file{config.sub} isn't included in this package, then this package +-doesn't need to know the machine type. ++doesn't need to know any machine type. ++ ++The file @file{config.sub} is a program that validates and canonicalizes ++a system type. ++It can do canonicalization, as in ++ ++@example ++$ sh config.sub x86_64-linux ++x86_64-pc-linux-gnu ++$ sh config.sub arm64-linux ++aarch64-unknown-linux-gnu ++@end example ++ ++@noindent ++It also validates the parts. For example, this interaction tells you ++that ``crusoe'' is not a valid cpu architecture name: + +-If you are @emph{building} compiler tools for cross-compiling, you +-should use the option @option{--target=@var{type}} to select the type of +-system they will produce code for. ++@example ++$ sh config.sub crusoe-linux ++Invalid configuration `crusoe-linux': machine `crusoe-unknown' not recognized ++@end example ++ ++@node Building for a different system type ++@section Creating binaries for a different system type ++ ++When you want to create binaries that will run on a different machine ++type than the one you are building on, you need to specify both ++@itemize @bullet ++@item ++a @option{--host=@var{type}} option, specifying the machine type on ++which the binaries shall run, ++@item ++compiler variables (@code{CC} for the C compiler, @code{CXX} for the C++ ++compiler, and so on), pointing to compilers that generate object code ++for that machine type. ++@end itemize ++ ++For example, to create binaries intended to run on a 64-bit ARM ++processor: ++@example ++./configure --host=aarch64-linux-gnu \ ++ CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ ++@end example + +-If you want to @emph{use} a cross compiler, that generates code for a +-platform different from the build platform, you should specify the +-@dfn{host} platform (i.e., that on which the generated programs will +-eventually be run) with @option{--host=@var{type}}. ++If you do this on a machine that can execute such binaries (e.g.@: by ++virtue of the @code{qemu-aarch64} program, system libraries for that ++architecture under @code{$QEMU_LD_PREFIX}, and a Linux ++@code{binfmt_misc} configuration), the build behaves like a native ++build. ++If not, the build is a cross-build, in the sense that @code{configure} ++will make cross-compilation guesses instead of running test programs, ++and ``make check'' will not work. ++ ++@node Troubleshooting the Build Type ++@section Fixing a ``cannot guess build type'' error ++ ++In rare cases, it may happen that @code{configure} fails with the error ++message ``cannot guess build type''. ++This error means that the files @file{config.guess} and ++@file{config.sub} don't recognize the type of the system on which you ++are building. ++In this case, first fetch the newest versions of these files, from ++@url{https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess} ++and ++@url{https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub}, ++respectively, and use these as drop-in replacement for the files ++@file{config.guess} and @file{config.sub} that were shipped with this ++package. ++ ++If this resolves the problem, feel free to report the solution to the ++maintainers of this package. ++ ++Otherwise, it means that your system is not yet supported by ++@file{config.guess} and @file{config.sub}. ++As a workaround, you can use a configure option ++@option{--build=@var{type}}, where @var{type} comes closest to your ++system type. ++Also, you're welcome to file a report to ++@email{config-patches@@gnu.org}. ++ ++@node Configuring a Compiler ++@section Configuration options specific to a compiler ++ ++If you are building a compiler, and this compiler should generate code ++for a system type that is different from the one on which the compiler ++binaries shall run on, use the option @option{--target=@var{type}} to ++select the type of system for which the compiler should produce code. + + @node Sharing Defaults + @section Sharing Defaults +@@ -384,9 +468,9 @@ Use @var{dir} as the installation prefix. @ref{Installation Names} + for more details, including other options available for fine-tuning + the installation locations. + +-@item --build=@var{type} +-Build for architecture @var{type}. @ref{System Type}. +-for more details, including other system type options. ++@item --host=@var{type} ++Build binaries for architecture @var{type}. @ref{System Types} and ++@ref{Building for a different system type} for more details. + + @item --enable-@var{feature} + @itemx --disable-@var{feature} +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/backports/0029-Shorten-and-improve-INSTALL.patch b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0029-Shorten-and-improve-INSTALL.patch new file mode 100644 index 0000000000..9129ab789a --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/backports/0029-Shorten-and-improve-INSTALL.patch @@ -0,0 +1,366 @@ +From d8ca8b323873e5cd9d969a062f70b31db450ba53 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Sat, 24 Jun 2023 14:39:34 -0700 +Subject: [PATCH 29/29] Shorten and improve INSTALL +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Rewrite install.texi so that INSTALL is shorter and hopefully +more useful for new installers. +* doc/install.texi: When not building the Autoconf manual, put +copyright notice at the end, and omit external references as they +do not work in INSTALL. +Avoid long URLs as they do not work well in INSTALL or +in info files. Be more consistent (though not entirely +consistent) about “system” vs “architecture”. +(System Types, Building for a different system type) +(Troubleshooting the Build Type): Coalesce into a single section +and rewrite for clarity and brevity. Mention build-aux. Do not +mention --target here as it’s too rare to make the cut. + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + doc/install.texi | 224 +++++++++++++++++------------------------------ + 1 file changed, 82 insertions(+), 142 deletions(-) + +diff --git a/doc/install.texi b/doc/install.texi +index a3ef17828..6c3a9c21c 100644 +--- a/doc/install.texi ++++ b/doc/install.texi +@@ -2,23 +2,13 @@ + @c the INSTALL file. + + @ifclear autoconf +- + @unnumbered Installation Instructions +- +-Copyright @copyright{} 1994--1996, 1999--2002, 2004--2017, 2020--2023 +-Free Software Foundation, Inc. +- +-Copying and distribution of this file, with or without modification, are +-permitted in any medium without royalty provided the copyright notice +-and this notice are preserved. This file is offered as-is, without +-warranty of any kind. +- + @end ifclear + + @node Basic Installation + @section Basic Installation + +-Briefly, the following shell commands: ++The following shell commands: + + @example + test -f configure || ./bootstrap +@@ -41,8 +31,13 @@ of the features documented below. The lack of an optional feature in a + given package is not necessarily a bug. + @end ifclear + More recommendations for GNU packages can be found in ++@ifset autoconf + @ref{Makefile Conventions, , Makefile Conventions, standards, + GNU Coding Standards}. ++@end ifset ++@ifclear autoconf ++the GNU Coding Standards. ++@end ifclear + + If the @command{bootstrap} shell script exists, it attempts to build the + @command{configure} shell script and related files, perhaps by +@@ -61,8 +56,8 @@ those values to create a @file{Makefile} in each directory of the + package. It may also create one or more @file{.h} files containing + system-dependent definitions. Finally, it creates a shell script + @file{config.status} that you can run in the future to recreate the +-current configuration, and a file @file{config.log} containing compiler +-output (useful mainly for debugging @command{configure}). ++current configuration, and a file @file{config.log} containing ++output useful for debugging @command{configure}. + + It can also use an optional file (typically called @file{config.cache} + and enabled with @option{--cache-file=config.cache} or simply +@@ -77,10 +72,9 @@ they can be considered for the next release. If you are using the + cache, and at some point @file{config.cache} contains results you don't + want to keep, you may remove or edit it. + +-The file @file{configure.ac} (or @file{configure.in}) is used to create +-@file{configure} by a program called @command{autoconf}. You need +-@file{configure.ac} if you want to change it or regenerate +-@file{configure} using a newer version of @command{autoconf}. ++The @command{autoconf} program generates @file{configure} from the file ++@file{configure.ac}. Normally you should edit @file{configure.ac} ++instead of editing @file{configure} directly. + + The simplest way to compile this package is: + +@@ -95,8 +89,7 @@ You may need special developer tools and network access to bootstrap. + + @item + Type @samp{./configure} to configure the package for your system. +- +-Running @command{configure} might take a while. While running, it prints some ++This might take a while. While running, @command{configure} prints + messages telling which features it is checking for. + + @item +@@ -125,21 +118,11 @@ code directory by typing @samp{make clean}. To also remove the files + that @command{configure} created (so you can compile the package for a + different kind of computer), type @samp{make distclean}. There is also + a @samp{make maintainer-clean} target, but that is intended mainly for +-the package's developers. If you use it, you may have to get all sorts +-of other programs in order to regenerate files that came with the +-distribution. ++the package's developers. If you use it, you may have to bootstrap again. + + @item +-Often, you can also type @samp{make uninstall} to remove the installed +-files again. In practice, not all packages have tested that +-uninstallation works correctly, even though it is required by the +-GNU Coding Standards. +- +-@item +-Some packages, particularly those that use Automake, provide @samp{make +-distcheck}, which can by used by developers to test that all other +-targets like @samp{make install} and @samp{make uninstall} work +-correctly. This target is generally not run by end users. ++If the package follows the GNU Coding Standards, ++you can type @samp{make uninstall} to remove the installed files. + @end enumerate + + @node Compilers and Options +@@ -158,21 +141,17 @@ Here is an example: + @end example + + See +-@ref{Defining Variables} and ++@ref{Defining Variables} + @ifset autoconf +-@ref{Preset Output Variables} ++and @ref{Preset Output Variables} + @end ifset +-@ifclear autoconf +-@ref{Preset Output Variables,,, autoconf, Autoconf} +-@c (@url{https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.71/html_node/Preset-Output-Variables.html}) +-@end ifclear + for more details. + + @node Multiple Architectures + @section Compiling For Multiple Architectures + + You can compile the package for more than one kind of computer at the +-same time, by placing the object files for each architecture in their ++same time, by placing the object files for each system in their + own directory. To do this, you can use GNU @command{make}. + @command{cd} to the directory where you want the object files and + executables to go and run the @command{configure} script. +@@ -182,9 +161,9 @@ known as a @dfn{VPATH} build. + + With a non-GNU @command{make}, + it is safer to compile the package for one +-architecture at a time in the source code directory. After you have +-installed the package for one architecture, use @samp{make distclean} +-before reconfiguring for another architecture. ++system at a time in the source code directory. After you have ++installed the package for one system, use @samp{make distclean} ++before reconfiguring for another system. + + Some platforms, notably macOS, support ``fat'' or ``universal'' binaries, + where a single binary can execute on different architectures. +@@ -274,117 +253,65 @@ which can be overridden with @code{make V=0}. + @node System Types + @section Specifying a System Type + +-The following sections go into details regarding situations where you +-may have to specify a system type, either through the option +-@option{--host=@var{type}}, or through the option +-@option{--build=@var{type}}, or -- in the case of compilers -- through +-@option{--target=@var{type}}. +- +-A system type @var{type} can either be a short name like @samp{mingw64}, +-or a canonical name like @samp{x86_64-pc-linux-gnu} which has the form: +- +-@example +-@var{cpu}-@var{company}-@var{system} +-@end example +- +-@noindent +-where @var{system} can have one of these forms: ++By default @command{configure} builds for the current system. ++To create binaries that can run on a different system type, ++specify a @option{--host=@var{type}} option along with compiler ++variables that specify how to generate object code for @var{type}. ++For example, to create binaries intended to run on a 64-bit ARM ++processor: + + @example +-@var{os} +-@var{kernel}-@var{os} ++./configure --host=aarch64-linux-gnu \ ++ CC=aarch64-linux-gnu-gcc \ ++ CXX=aarch64-linux-gnu-g++ + @end example + + @noindent +-See the file @file{config.sub} for the possible values of each field. +-If @file{config.sub} isn't included in this package, then this package +-doesn't need to know any machine type. +- +-The file @file{config.sub} is a program that validates and canonicalizes +-a system type. +-It can do canonicalization, as in ++If done on a machine that can execute these binaries ++(e.g., via @command{qemu-aarch64}, @env{$QEMU_LD_PREFIX}, and Linux's ++@code{binfmt_misc} capability), the build behaves like a native build. ++Otherwise it is a cross-build: @code{configure} ++will make cross-compilation guesses instead of running test programs, ++and @code{make check} will not work. ++ ++A system type can either be a short name like @samp{mingw64}, ++or a canonical name like @samp{x86_64-pc-linux-gnu}. ++Canonical names have the form @var{cpu}-@var{company}-@var{system} ++where @var{system} is either @var{os} or @var{kernel}-@var{os}. ++To canonicalize and validate a system type, ++you can run the command @file{config.sub}, ++which is often squirreled away in a subdirectory like @file{build-aux}. ++For example: + + @example +-$ sh config.sub x86_64-linux +-x86_64-pc-linux-gnu +-$ sh config.sub arm64-linux ++$ build-aux/config.sub arm64-linux + aarch64-unknown-linux-gnu ++$ build-aux/config.sub riscv-lnx ++Invalid configuration 'riscv-lnx': OS 'lnx' not recognized + @end example + + @noindent +-It also validates the parts. For example, this interaction tells you +-that ``crusoe'' is not a valid cpu architecture name: +- +-@example +-$ sh config.sub crusoe-linux +-Invalid configuration `crusoe-linux': machine `crusoe-unknown' not recognized +-@end example +- +-@node Building for a different system type +-@section Creating binaries for a different system type +- +-When you want to create binaries that will run on a different machine +-type than the one you are building on, you need to specify both +-@itemize @bullet +-@item +-a @option{--host=@var{type}} option, specifying the machine type on +-which the binaries shall run, +-@item +-compiler variables (@code{CC} for the C compiler, @code{CXX} for the C++ +-compiler, and so on), pointing to compilers that generate object code +-for that machine type. +-@end itemize +- +-For example, to create binaries intended to run on a 64-bit ARM +-processor: +-@example +-./configure --host=aarch64-linux-gnu \ +- CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ +-@end example +- +-If you do this on a machine that can execute such binaries (e.g.@: by +-virtue of the @code{qemu-aarch64} program, system libraries for that +-architecture under @code{$QEMU_LD_PREFIX}, and a Linux +-@code{binfmt_misc} configuration), the build behaves like a native +-build. +-If not, the build is a cross-build, in the sense that @code{configure} +-will make cross-compilation guesses instead of running test programs, +-and ``make check'' will not work. +- +-@node Troubleshooting the Build Type +-@section Fixing a ``cannot guess build type'' error +- +-In rare cases, it may happen that @code{configure} fails with the error +-message ``cannot guess build type''. +-This error means that the files @file{config.guess} and +-@file{config.sub} don't recognize the type of the system on which you +-are building. +-In this case, first fetch the newest versions of these files, from +-@url{https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess} +-and +-@url{https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub}, +-respectively, and use these as drop-in replacement for the files +-@file{config.guess} and @file{config.sub} that were shipped with this +-package. +- +-If this resolves the problem, feel free to report the solution to the +-maintainers of this package. +- +-Otherwise, it means that your system is not yet supported by +-@file{config.guess} and @file{config.sub}. +-As a workaround, you can use a configure option +-@option{--build=@var{type}}, where @var{type} comes closest to your +-system type. +-Also, you're welcome to file a report to ++You can look at the @file{config.sub} file to see which types are recognized. ++If the file is absent, this package does not need the system type. ++ ++If @command{configure} fails with the diagnostic ``cannot guess build type''. ++@file{config.sub} did not recognize your system's type. ++In this case, first fetch the newest versions of these files ++from the @url{https://savannah.gnu.org/projects/config, GNU config package}. ++If that fixes things, please report it to the ++maintainers of the package containing @command{configure}. ++Otherwise, you can try the configure option ++@option{--build=@var{type}} where @var{type} comes close to your ++system type; also, please report the problem to + @email{config-patches@@gnu.org}. + +-@node Configuring a Compiler +-@section Configuration options specific to a compiler +- +-If you are building a compiler, and this compiler should generate code +-for a system type that is different from the one on which the compiler +-binaries shall run on, use the option @option{--target=@var{type}} to +-select the type of system for which the compiler should produce code. ++For more details about configuring system types, see ++@ifset autoconf ++@ref{Manual Configuration}. ++@end ifset ++@ifclear autoconf ++the Autoconf documentation. ++@end ifclear + + @node Sharing Defaults + @section Sharing Defaults +@@ -469,8 +396,8 @@ for more details, including other options available for fine-tuning + the installation locations. + + @item --host=@var{type} +-Build binaries for architecture @var{type}. @ref{System Types} and +-@ref{Building for a different system type} for more details. ++Build binaries for system @var{type}. ++@xref{System Types}. + + @item --enable-@var{feature} + @itemx --disable-@var{feature} +@@ -497,6 +424,19 @@ Run the configure checks, but stop before creating any output files. + and accepts some other, less widely useful, options. + Run @samp{configure --help} for more details. + ++@ifclear autoconf ++@node Copyright notice ++@section Copyright notice ++ ++Copyright @copyright{} 1994--1996, 1999--2002, 2004--2017, 2020--2023 ++Free Software Foundation, Inc. ++ ++Copying and distribution of this file, with or without modification, are ++permitted in any medium without royalty provided the copyright notice ++and this notice are preserved. This file is offered as-is, without ++warranty of any kind. ++@end ifclear ++ + @c Local Variables: + @c fill-column: 72 + @c ispell-local-dictionary: "american" +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf_2.71.bb b/poky/meta/recipes-devtools/autoconf/autoconf_2.72c.bb index 97c241a3f5..76130d58a5 100644 --- a/poky/meta/recipes-devtools/autoconf/autoconf_2.71.bb +++ b/poky/meta/recipes-devtools/autoconf/autoconf_2.72c.bb @@ -11,18 +11,50 @@ DEPENDS:remove:class-native = "autoconf-native automake-native help2man-native" LIC_FILES_CHKSUM = "file://COPYING;md5=cc3f3a7596cb558bbd9eb7fbaa3ef16c \ file://COPYINGv3;md5=1ebbd3e34237af26da5dc08a4e440464" -SRC_URI = "${GNU_MIRROR}/autoconf/${BP}.tar.gz \ +SRC_URI = " \ + https://alpha.gnu.org/gnu/autoconf/autoconf-2.72c.tar.gz \ file://program_prefix.patch \ file://autoreconf-exclude.patch \ file://remove-usr-local-lib-from-m4.patch \ file://preferbash.patch \ file://autotest-automake-result-format.patch \ file://man-host-perl.patch \ - file://0001-Port-to-compilers-that-moan-about-K-R-func-decls.patch \ - " + ${BACKPORTS} \ +" SRC_URI:append:class-native = " file://no-man.patch" -SRC_URI[sha256sum] = "431075ad0bf529ef13cb41e9042c542381103e80015686222b8a9d4abef42a1c" +BACKPORTS = "\ + file://backports/0001-mention-prototypes-more-prominently-in-NEWS.patch \ + file://backports/0002-build-run-make-fetch-which-updated-these.patch \ + file://backports/0003-NEWS-Tighten-up-wording.patch \ + file://backports/0004-Cater-to-programs-misusing-AC_EGREP_HEADER.patch \ + file://backports/0006-Fix-timing-bug-on-high-speed-builds.patch \ + file://backports/0007-Support-underquoted-callers-better.patch \ + file://backports/0008-New-script-for-building-inside-Guix-containers.patch \ + file://backports/0009-AC_XENIX_DIR-Rewrite-using-AC_CANONICAL_HOST.patch \ + file://backports/0010-AC_TYPE_UID_T-Rewrite-using-AC_CHECK_TYPE.patch \ + file://backports/0011-Make-AC_PROG_GCC_TRADITIONAL-a-compatibility-alias-f.patch \ + file://backports/0012-Overhaul-AC_TYPE_GETGROUPS-and-AC_FUNC_GETGROUPS.patch \ + file://backports/0013-Fold-AC_C_STRINGIZE-into-AC_PROG_CC.patch \ + file://backports/0014-Remove-the-last-few-internal-uses-of-AC_EGREP_CPP.patch \ + file://backports/0015-Support-circa-early-2022-Gnulib.patch \ + file://backports/0016-Improve-year2038-largefile-option-processing.patch \ + file://backports/0017-AC_SYS_YEAR2038-Fix-configure-failure-on-32-bit-ming.patch \ + file://backports/0018-Document-limitation-of-BusyBox-tr.patch \ + file://backports/0019-AC_SYS_YEAR2038_REQUIRED-Fix-configure-failure-with-.patch \ + file://backports/0020-Tone-down-year-2038-changes.patch \ + file://backports/0021-Port-AC_FUNC_MMAP-to-more-modern-systems.patch \ + file://backports/0022-Fix-port-of-AC_FUNC_MMAP.patch \ + file://backports/0023-Improve-AC_SYS_YEAR2038_RECOMMENDED-diagnostic.patch \ + file://backports/0024-Improve-AC_FUNC_MMAP-comments.patch \ + file://backports/0025-Fix-AC_SYS_LARGEFILE-on-GNU-Linux-alpha-s390x.patch \ + file://backports/0026-Modernize-INSTALL.patch \ + file://backports/0027-doc-fix-broken-cross-refs.patch \ + file://backports/0028-INSTALL-Clarify-build-host-target-and-the-system-typ.patch \ + file://backports/0029-Shorten-and-improve-INSTALL.patch \ +" + +SRC_URI[sha256sum] = "21b64169c820c6cdf27fc981ca9c2fb615546e5dead92bccf8d92d0784cdd364" RDEPENDS:${PN} = "m4 gnu-config \ perl \ diff --git a/poky/meta/recipes-devtools/binutils/binutils-2.40.inc b/poky/meta/recipes-devtools/binutils/binutils-2.41.inc index dea68ee6fc..7ab2926570 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-2.40.inc +++ b/poky/meta/recipes-devtools/binutils/binutils-2.41.inc @@ -10,15 +10,15 @@ LIC_FILES_CHKSUM="\ file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\ " -# When upgrading to 2.41, please make sure there is no trailing .0, so +# When upgrading to 2.42, please make sure there is no trailing .0, so # that upstream version check can work correctly. -PV = "2.40" -CVE_VERSION = "2.40" -SRCBRANCH ?= "binutils-2_40-branch" +PV = "2.41" +CVE_VERSION = "2.41" +SRCBRANCH ?= "binutils-2_41-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" -SRCREV ?= "4671be001eb5a899ecac3e2686a92934000f8262" +SRCREV ?= "fd3cc73ee4a84df3ace3c0e470250a957e7d3468" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https" SRC_URI = "\ ${BINUTILS_GIT_URI} \ @@ -32,9 +32,7 @@ SRC_URI = "\ file://0011-Check-for-clang-before-checking-gcc-version.patch \ file://0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ file://0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ - file://0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch \ - file://0016-CVE-2023-25586.patch \ - file://fix-time64.patch \ - file://0001-Fix-an-illegal-memory-access-when-an-accessing-a-zer.patch \ + file://0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch \ + file://0015-gprofng-Fix-build-with-64bit-file-offset-on-32bit-ma.patch \ " S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.40.bb b/poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.41.bb index 5dbaa03017..5dbaa03017 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.40.bb +++ b/poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.41.bb diff --git a/poky/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.40.bb b/poky/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.41.bb index 14480785b4..14480785b4 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.40.bb +++ b/poky/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.41.bb diff --git a/poky/meta/recipes-devtools/binutils/binutils-cross_2.40.bb b/poky/meta/recipes-devtools/binutils/binutils-cross_2.41.bb index fbd1f7d25a..fbd1f7d25a 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-cross_2.40.bb +++ b/poky/meta/recipes-devtools/binutils/binutils-cross_2.41.bb diff --git a/poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.40.bb b/poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.41.bb index 6752659304..6752659304 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.40.bb +++ b/poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.41.bb diff --git a/poky/meta/recipes-devtools/binutils/binutils/0001-Fix-an-illegal-memory-access-when-an-accessing-a-zer.patch b/poky/meta/recipes-devtools/binutils/binutils/0001-Fix-an-illegal-memory-access-when-an-accessing-a-zer.patch deleted file mode 100644 index 31157cacd2..0000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/0001-Fix-an-illegal-memory-access-when-an-accessing-a-zer.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c22d38baefc5a7a1e1f5cdc9dbb556b1f0ec5c57 Mon Sep 17 00:00:00 2001 -From: Nick Clifton <nickc@redhat.com> -Date: Thu, 30 Mar 2023 10:10:09 +0100 -Subject: [PATCH] Fix an illegal memory access when an accessing a - zer0-lengthverdef table. - - PR 30285 - * elf.c (_bfd_elf_slurp_version_tables): Fail if no version definitions are allocated. - -CVE: CVE-2023-1972 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> ---- - bfd/ChangeLog | 6 ++++++ - bfd/elf.c | 5 +++++ - 2 files changed, 11 insertions(+) - -diff --git a/bfd/elf.c b/bfd/elf.c -index 027d0143735..185028cbd97 100644 ---- a/bfd/elf.c -+++ b/bfd/elf.c -@@ -9030,6 +9030,9 @@ _bfd_elf_slurp_version_tables (bfd *abfd, bool default_imported_symver) - bfd_set_error (bfd_error_file_too_big); - goto error_return_verdef; - } -+ -+ if (amt == 0) -+ goto error_return_verdef; - elf_tdata (abfd)->verdef = (Elf_Internal_Verdef *) bfd_zalloc (abfd, amt); - if (elf_tdata (abfd)->verdef == NULL) - goto error_return_verdef; -@@ -9133,6 +9136,8 @@ _bfd_elf_slurp_version_tables (bfd *abfd, bool default_imported_symver) - bfd_set_error (bfd_error_file_too_big); - goto error_return; - } -+ if (amt == 0) -+ goto error_return; - elf_tdata (abfd)->verdef = (Elf_Internal_Verdef *) bfd_zalloc (abfd, amt); - if (elf_tdata (abfd)->verdef == NULL) - goto error_return; --- -2.34.1 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch index ca249834ea..ef7e1c4317 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch @@ -1,4 +1,4 @@ -From 4bdab425bdd7dc52c95bfd62e035c1b9abe9595e Mon Sep 17 00:00:00 2001 +From 95e23fba624c90d0e62c1adaf2bcc4f3cd3175c0 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:58:54 +0000 Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs @@ -21,10 +21,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gold/layout.cc b/gold/layout.cc -index 899d4af0707..7c31b1bef6e 100644 +index b94855f8662..51f2d74d79d 100644 --- a/gold/layout.cc +++ b/gold/layout.cc -@@ -5083,7 +5083,7 @@ Layout::create_interp(const Target* target) +@@ -5102,7 +5102,7 @@ Layout::create_interp(const Target* target) gold_assert(interp != NULL); } @@ -59,7 +59,7 @@ index 382bd07ffe2..9fbd0c4cb8a 100755 DATA_ALIGNMENT=${DATA_ALIGNMENT_} RELOCATING=" " diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc -index 5d3b0d31b1b..2163909cd56 100644 +index 1e3c5aa8504..b8d1977b3f0 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc @@ -148,8 +148,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then diff --git a/poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch index 663dc4af7d..3ea6923fd8 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch @@ -1,4 +1,4 @@ -From c79005d4d9991593557766ad569f48c26482399f Mon Sep 17 00:00:00 2001 +From 2b3017e7dab4d929d3ab664c5e6f94226b0a6d31 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 6 Mar 2017 23:37:05 -0800 Subject: [PATCH] binutils-cross: Do not generate linker script directories diff --git a/poky/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch b/poky/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch index f46116f1af..ace279bd84 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch @@ -1,4 +1,4 @@ -From 70da8b91026c5381d430194910fc15e3b6c5ec7f Mon Sep 17 00:00:00 2001 +From c00ead7264dc1335cb43222cb742b95614666be8 Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Wed, 19 Feb 2020 09:51:16 -0800 Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK @@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index b3195b4be68..fc6460317a7 100644 +index c3adbb0ccad..ce0f7e7f85d 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ @@ -43,7 +43,7 @@ index b3195b4be68..fc6460317a7 100644 NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) diff --git a/ld/Makefile.in b/ld/Makefile.in -index fe422569228..4a4c851b44a 100644 +index d1a56026437..9d86aed12c6 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -566,7 +566,8 @@ ZLIB = @zlibdir@ -lz @@ -57,7 +57,7 @@ index fe422569228..4a4c851b44a 100644 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) diff --git a/ld/ldelf.c b/ld/ldelf.c -index eff6693e052..95787012b89 100644 +index f9a6819366f..1519f8ac4e5 100644 --- a/ld/ldelf.c +++ b/ld/ldelf.c @@ -936,7 +936,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, @@ -65,15 +65,15 @@ index eff6693e052..95787012b89 100644 info.path = NULL; info.len = info.alloc = 0; - tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", -+ tmppath = concat (ld_sysconfdir, "/etc/ld.so.conf", ++ tmppath = concat (ld_sysconfdir, "/ld.so.conf", (const char *) NULL); if (!ldelf_parse_ld_so_conf (&info, tmppath)) { diff --git a/ld/ldmain.c b/ld/ldmain.c -index 9290a189b0d..ceaca2d85d0 100644 +index 06ac2c64fa8..5c38e8cd313 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -70,6 +70,7 @@ char *program_name; +@@ -69,6 +69,7 @@ char *program_name; /* The prefix for system library directories. */ const char *ld_sysroot; diff --git a/poky/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/poky/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch index e7d2593c49..0747e40491 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch @@ -1,4 +1,4 @@ -From fa477bb947fa17543f4550bc0e7e715c8355649c Mon Sep 17 00:00:00 2001 +From d2d1281b0b76f96c64a2043772c52c85f58994d5 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:09:58 +0000 Subject: [PATCH] Point scripts location to libdir @@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index fc6460317a7..1b875904b8d 100644 +index ce0f7e7f85d..2e36ab4efc4 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) @@ -25,7 +25,7 @@ index fc6460317a7..1b875904b8d 100644 EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ diff --git a/ld/Makefile.in b/ld/Makefile.in -index 4a4c851b44a..08dcd7b75fc 100644 +index 9d86aed12c6..c21c554e432 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -574,7 +574,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) diff --git a/poky/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/poky/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch index 7242f48795..9fe8b73d87 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch @@ -1,4 +1,4 @@ -From 7912f5a918e612950feb04d845934f26160e85da Mon Sep 17 00:00:00 2001 +From 5564cdf1433255a00acb427fb5b0656b772b2651 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:39:01 +0000 Subject: [PATCH] don't let the distro compiler point to the wrong installation diff --git a/poky/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch b/poky/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch index 87bbe9fb1b..9b09ec09cb 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch @@ -1,4 +1,4 @@ -From 725ca09ee1041f64589f26ba815ef11da687c608 Mon Sep 17 00:00:00 2001 +From 41b09c6a9d78a31db0f3c70d27c05475292bde7e Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 15 Jan 2016 06:31:09 +0000 Subject: [PATCH] warn for uses of system directories when cross linking @@ -59,8 +59,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> ld/ldfile.c | 17 +++++++++++++++++ ld/ldlex.h | 2 ++ ld/ldmain.c | 6 ++++-- - ld/lexsup.c | 16 ++++++++++++++++ - 9 files changed, 88 insertions(+), 2 deletions(-) + ld/lexsup.c | 15 +++++++++++++++ + 9 files changed, 87 insertions(+), 2 deletions(-) diff --git a/ld/config.in b/ld/config.in index ad0dc6a106c..d21edaddce7 100644 @@ -77,7 +77,7 @@ index ad0dc6a106c..d21edaddce7 100644 #undef EXTRA_SHLIB_EXTENSION diff --git a/ld/configure b/ld/configure -index 995708089fd..6406a42c442 100755 +index 1503936432f..29896853a90 100755 --- a/ld/configure +++ b/ld/configure @@ -839,6 +839,7 @@ with_lib_path @@ -139,7 +139,7 @@ index 77edac3258c..a74dac63038 100644 dnl "install_as_default" is set to false if gold is the default linker. dnl "installed_linker" is the installed BFD linker name. diff --git a/ld/ld.h b/ld/ld.h -index 05649ff61b8..1818c227473 100644 +index a0f8a15c7a9..e3db345f3a5 100644 --- a/ld/ld.h +++ b/ld/ld.h @@ -163,6 +163,14 @@ typedef struct @@ -158,10 +158,10 @@ index 05649ff61b8..1818c227473 100644 enum endian_enum endian; diff --git a/ld/ld.texi b/ld/ld.texi -index db3a9f09b45..77037399cb9 100644 +index aa8b1aa86eb..9bc4bc28823 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2960,6 +2960,18 @@ creation of the metadata note, if one had been enabled by an earlier +@@ -3059,6 +3059,18 @@ creation of the metadata note, if one had been enabled by an earlier occurrence of the --package-metdata option. If the linker has been built with libjansson, then the JSON string will be validated. @@ -181,10 +181,10 @@ index db3a9f09b45..77037399cb9 100644 @c man end diff --git a/ld/ldfile.c b/ld/ldfile.c -index b8fd4e5d8e0..1f1d8e23bc9 100644 +index df7c9cbd65e..0c965593225 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bool cmdline) +@@ -327,6 +327,23 @@ ldfile_add_library_path (const char *name, bool cmdline) new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); @@ -209,23 +209,23 @@ index b8fd4e5d8e0..1f1d8e23bc9 100644 /* Try to open a BFD for a lang_input_statement. */ diff --git a/ld/ldlex.h b/ld/ldlex.h -index 0538f0a06a1..f94a71875d8 100644 +index 87cac02141d..d1a478fb827 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h -@@ -170,6 +170,8 @@ enum option_values - OPTION_NO_WARN_EXECSTACK, - OPTION_WARN_RWX_SEGMENTS, - OPTION_NO_WARN_RWX_SEGMENTS, +@@ -147,6 +147,8 @@ enum option_values + OPTION_PLUGIN, + OPTION_PLUGIN_OPT, + #endif /* BFD_SUPPORTS_PLUGINS */ + OPTION_NO_POISON_SYSTEM_DIRECTORIES, + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ + OPTION_DEFAULT_SCRIPT, + OPTION_PRINT_OUTPUT_FORMAT, + OPTION_PRINT_SYSROOT, diff --git a/ld/ldmain.c b/ld/ldmain.c -index ceaca2d85d0..62e7b4e5341 100644 +index 5c38e8cd313..04eed320aca 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -322,6 +322,8 @@ main (int argc, char **argv) +@@ -326,6 +326,8 @@ main (int argc, char **argv) command_line.warn_mismatch = true; command_line.warn_search_mismatch = true; command_line.check_section_addresses = -1; @@ -234,7 +234,7 @@ index ceaca2d85d0..62e7b4e5341 100644 /* We initialize DEMANGLING based on the environment variable COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -@@ -1454,7 +1456,7 @@ undefined_symbol (struct bfd_link_info *info, +@@ -1458,7 +1460,7 @@ undefined_symbol (struct bfd_link_info *info, argv[1] = "undefined-symbol"; argv[2] = (char *) name; argv[3] = NULL; @@ -243,7 +243,7 @@ index ceaca2d85d0..62e7b4e5341 100644 if (verbose) einfo (_("%P: About to run error handling script '%s' with arguments: '%s' '%s'\n"), argv[0], argv[1], argv[2]); -@@ -1475,7 +1477,7 @@ undefined_symbol (struct bfd_link_info *info, +@@ -1479,7 +1481,7 @@ undefined_symbol (struct bfd_link_info *info, carry on to issue the normal error message. */ } #endif /* SUPPORT_ERROR_HANDLING_SCRIPT */ @@ -253,10 +253,10 @@ index ceaca2d85d0..62e7b4e5341 100644 { if (error_count < MAX_ERRORS_IN_A_ROW) diff --git a/ld/lexsup.c b/ld/lexsup.c -index a1c6140100d..d47ba4f977d 100644 +index fe8722313fe..1df7af3ccaa 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -613,6 +613,14 @@ static const struct ld_option ld_options[] = +@@ -629,6 +629,14 @@ static const struct ld_option ld_options[] = " <method> is: share-unconflicted (default),\n" " share-duplicated"), TWO_DASHES }, @@ -271,18 +271,17 @@ index a1c6140100d..d47ba4f977d 100644 }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -1737,6 +1745,14 @@ parse_args (unsigned argc, char **argv) - config.print_map_discarded = true; - break; +@@ -1787,6 +1795,13 @@ parse_args (unsigned argc, char **argv) + case OPTION_PRINT_MAP_LOCALS: + config.print_map_locals = true; ++ + case OPTION_NO_POISON_SYSTEM_DIRECTORIES: + command_line.poison_system_directories = false; + break; + + case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: + command_line.error_poison_system_directories = true; -+ break; -+ - case OPTION_DEPENDENCY_FILE: - config.dependency_file = optarg; break; + + case OPTION_DEPENDENCY_FILE: diff --git a/poky/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/poky/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch index fdd1f7756f..d39979068e 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch @@ -1,4 +1,4 @@ -From 4e9d4ace8a340399aeaa8332e2cfbfcc7d2d14d7 Mon Sep 17 00:00:00 2001 +From 7f04e82ac2ded9a7f68dba9fabf1251d680bd0b9 Mon Sep 17 00:00:00 2001 From: Zhenhua Luo <zhenhua.luo@nxp.com> Date: Sat, 11 Jun 2016 22:08:29 -0500 Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic diff --git a/poky/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch b/poky/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch index 0be871f5cf..432c431032 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch @@ -1,4 +1,4 @@ -From a66b1806350a9bed7b188c7d115991f6cdee51a9 Mon Sep 17 00:00:00 2001 +From 8fc55f06d8950607f22e81f51c67dd4e6b4f6742 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 14 Feb 2016 17:04:07 +0000 Subject: [PATCH] Use libtool 2.4 @@ -27,11 +27,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> gprofng/src/Makefile.in | 2 + ld/Makefile.in | 3 + ld/configure | 1704 ++++++++++++---- - libbacktrace/Makefile.in | 3 + - libbacktrace/configure | 1331 +++++++++--- + libbacktrace/Makefile.in | 108 +- + libbacktrace/aclocal.m4 | 73 +- + libbacktrace/configure | 1441 +++++++++---- libctf/Makefile.in | 2 + libctf/configure | 1330 +++++++++--- - libsframe/Makefile.in | 249 ++- + libsframe/Makefile.in | 344 ++-- libsframe/aclocal.m4 | 220 +- libsframe/configure | 1553 ++++++++++---- libtool.m4 | 1093 ++++++---- @@ -41,17 +42,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> lt~obsolete.m4 | 2 +- opcodes/Makefile.in | 3 + opcodes/configure | 1331 +++++++++--- - sim/Makefile.in | 3 + - sim/configure | 1331 +++++++++--- zlib/Makefile.in | 3 + zlib/configure | 1331 +++++++++--- - 36 files changed, 16896 insertions(+), 6289 deletions(-) + 35 files changed, 16108 insertions(+), 6126 deletions(-) diff --git a/bfd/Makefile.in b/bfd/Makefile.in -index 80aed657643..106ec256a79 100644 +index 4edfedee924..ed7257f2e96 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in -@@ -347,6 +347,7 @@ DATADIRNAME = @DATADIRNAME@ +@@ -334,6 +334,7 @@ DATADIRNAME = @DATADIRNAME@ DEBUGDIR = @DEBUGDIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -59,7 +58,7 @@ index 80aed657643..106ec256a79 100644 DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ -@@ -381,6 +382,7 @@ LN_S = @LN_S@ +@@ -368,6 +369,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ @@ -67,7 +66,7 @@ index 80aed657643..106ec256a79 100644 MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -@@ -427,6 +429,7 @@ abs_builddir = @abs_builddir@ +@@ -414,6 +416,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ @@ -76,7 +75,7 @@ index 80aed657643..106ec256a79 100644 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ all_backends = @all_backends@ diff --git a/bfd/configure b/bfd/configure -index 60ea6becab2..84dcdf167ba 100755 +index abc24a93028..f4c8ea4e54b 100755 --- a/bfd/configure +++ b/bfd/configure @@ -706,6 +706,9 @@ OTOOL @@ -1400,7 +1399,7 @@ index 60ea6becab2..84dcdf167ba 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -13482,7 +14132,7 @@ SHARED_LDFLAGS= +@@ -13707,7 +14357,7 @@ SHARED_LDFLAGS= if test "$enable_shared" = "yes"; then x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` if test -n "$x"; then @@ -1409,7 +1408,7 @@ index 60ea6becab2..84dcdf167ba 100755 fi fi -@@ -16129,13 +16779,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -16326,13 +16976,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -1430,7 +1429,7 @@ index 60ea6becab2..84dcdf167ba 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -16150,14 +16807,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -16347,14 +17004,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -1449,7 +1448,7 @@ index 60ea6becab2..84dcdf167ba 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -16190,12 +16850,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -16387,12 +17047,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -1463,7 +1462,7 @@ index 60ea6becab2..84dcdf167ba 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16250,8 +16910,13 @@ reload_flag \ +@@ -16447,8 +17107,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -1477,7 +1476,7 @@ index 60ea6becab2..84dcdf167ba 100755 STRIP \ RANLIB \ CC \ -@@ -16261,12 +16926,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -16458,12 +17123,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -1493,7 +1492,7 @@ index 60ea6becab2..84dcdf167ba 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -16282,7 +16949,6 @@ no_undefined_flag \ +@@ -16479,7 +17146,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -1501,7 +1500,7 @@ index 60ea6becab2..84dcdf167ba 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -16318,6 +16984,7 @@ module_cmds \ +@@ -16515,6 +17181,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -1509,7 +1508,7 @@ index 60ea6becab2..84dcdf167ba 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -17086,7 +17753,8 @@ $as_echo X"$file" | +@@ -17283,7 +17950,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -1519,7 +1518,7 @@ index 60ea6becab2..84dcdf167ba 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -17189,19 +17857,42 @@ SP2NL=$lt_lt_SP2NL +@@ -17386,19 +18054,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -1563,7 +1562,7 @@ index 60ea6becab2..84dcdf167ba 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -17231,6 +17922,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -17428,6 +18119,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -1576,7 +1575,7 @@ index 60ea6becab2..84dcdf167ba 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -17240,6 +17937,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -17437,6 +18134,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -1586,7 +1585,7 @@ index 60ea6becab2..84dcdf167ba 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -17354,12 +18054,12 @@ with_gcc=$GCC +@@ -17551,12 +18251,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -1602,7 +1601,7 @@ index 60ea6becab2..84dcdf167ba 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -17446,9 +18146,6 @@ inherit_rpath=$inherit_rpath +@@ -17643,9 +18343,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -1612,7 +1611,7 @@ index 60ea6becab2..84dcdf167ba 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -17464,6 +18161,9 @@ include_expsyms=$lt_include_expsyms +@@ -17661,6 +18358,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -1622,7 +1621,7 @@ index 60ea6becab2..84dcdf167ba 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -17496,210 +18196,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -17693,210 +18393,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -1997,10 +1996,10 @@ index 60ea6becab2..84dcdf167ba 100755 chmod +x "$ofile" diff --git a/bfd/configure.ac b/bfd/configure.ac -index 015fd011893..58f73ec709c 100644 +index f044616f4d9..c2b2ab1ec68 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac -@@ -272,7 +272,7 @@ changequote(,)dnl +@@ -274,7 +274,7 @@ changequote(,)dnl x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` changequote([,])dnl if test -n "$x"; then @@ -2010,7 +2009,7 @@ index 015fd011893..58f73ec709c 100644 fi diff --git a/binutils/Makefile.in b/binutils/Makefile.in -index 27315addc0f..5ddd5a42a7d 100644 +index 2de46be1b30..70a04f1c538 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -493,6 +493,7 @@ DEBUGINFOD_LIBS = @DEBUGINFOD_LIBS@ @@ -2038,7 +2037,7 @@ index 27315addc0f..5ddd5a42a7d 100644 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ diff --git a/binutils/configure b/binutils/configure -index c7bd42049c3..06285371350 100755 +index 4cd196ab74b..dca6f77919d 100755 --- a/binutils/configure +++ b/binutils/configure @@ -700,8 +700,11 @@ OTOOL @@ -3361,7 +3360,7 @@ index c7bd42049c3..06285371350 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15549,13 +16199,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -15555,13 +16205,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -3382,7 +3381,7 @@ index c7bd42049c3..06285371350 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15570,14 +16227,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -15576,14 +16233,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -3401,7 +3400,7 @@ index c7bd42049c3..06285371350 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15610,12 +16270,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -15616,12 +16276,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -3415,7 +3414,7 @@ index c7bd42049c3..06285371350 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -15670,8 +16330,13 @@ reload_flag \ +@@ -15676,8 +16336,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -3429,7 +3428,7 @@ index c7bd42049c3..06285371350 100755 STRIP \ RANLIB \ CC \ -@@ -15681,12 +16346,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -15687,12 +16352,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -3445,7 +3444,7 @@ index c7bd42049c3..06285371350 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -15702,7 +16369,6 @@ no_undefined_flag \ +@@ -15708,7 +16375,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -3453,7 +3452,7 @@ index c7bd42049c3..06285371350 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -15738,6 +16404,7 @@ module_cmds \ +@@ -15744,6 +16410,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -3461,7 +3460,7 @@ index c7bd42049c3..06285371350 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -16503,7 +17170,8 @@ $as_echo X"$file" | +@@ -16509,7 +17176,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -3471,7 +3470,7 @@ index c7bd42049c3..06285371350 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -16606,19 +17274,42 @@ SP2NL=$lt_lt_SP2NL +@@ -16612,19 +17280,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -3515,7 +3514,7 @@ index c7bd42049c3..06285371350 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -16648,6 +17339,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -16654,6 +17345,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -3528,7 +3527,7 @@ index c7bd42049c3..06285371350 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -16657,6 +17354,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -16663,6 +17360,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -3538,7 +3537,7 @@ index c7bd42049c3..06285371350 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -16771,12 +17471,12 @@ with_gcc=$GCC +@@ -16777,12 +17477,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -3554,7 +3553,7 @@ index c7bd42049c3..06285371350 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -16863,9 +17563,6 @@ inherit_rpath=$inherit_rpath +@@ -16869,9 +17569,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -3564,7 +3563,7 @@ index c7bd42049c3..06285371350 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -16881,6 +17578,9 @@ include_expsyms=$lt_include_expsyms +@@ -16887,6 +17584,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -3574,7 +3573,7 @@ index c7bd42049c3..06285371350 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -16913,210 +17613,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -16919,210 +17619,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -3949,7 +3948,7 @@ index c7bd42049c3..06285371350 100755 chmod +x "$ofile" diff --git a/gas/Makefile.in b/gas/Makefile.in -index 8319181b472..3425e414c1c 100644 +index 427f42dfa3a..ec6615d34e3 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -377,6 +377,7 @@ CYGPATH_W = @CYGPATH_W@ @@ -3977,7 +3976,7 @@ index 8319181b472..3425e414c1c 100644 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ diff --git a/gas/configure b/gas/configure -index 3c0c3e27d3b..11baafb9db6 100755 +index db1b80fc907..4bdd9705d8d 100755 --- a/gas/configure +++ b/gas/configure @@ -686,8 +686,11 @@ OTOOL @@ -5300,7 +5299,7 @@ index 3c0c3e27d3b..11baafb9db6 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15133,13 +15783,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -15132,13 +15782,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -5321,7 +5320,7 @@ index 3c0c3e27d3b..11baafb9db6 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15154,14 +15811,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -15153,14 +15810,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -5340,7 +5339,7 @@ index 3c0c3e27d3b..11baafb9db6 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15194,12 +15854,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -15193,12 +15853,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -5354,7 +5353,7 @@ index 3c0c3e27d3b..11baafb9db6 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -15254,8 +15914,13 @@ reload_flag \ +@@ -15253,8 +15913,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -5368,7 +5367,7 @@ index 3c0c3e27d3b..11baafb9db6 100755 STRIP \ RANLIB \ CC \ -@@ -15265,12 +15930,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -15264,12 +15929,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -5384,7 +5383,7 @@ index 3c0c3e27d3b..11baafb9db6 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -15286,7 +15953,6 @@ no_undefined_flag \ +@@ -15285,7 +15952,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -5392,7 +5391,7 @@ index 3c0c3e27d3b..11baafb9db6 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -15322,6 +15988,7 @@ module_cmds \ +@@ -15321,6 +15987,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -5400,7 +5399,7 @@ index 3c0c3e27d3b..11baafb9db6 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -16094,7 +16761,8 @@ $as_echo X"$file" | +@@ -16093,7 +16760,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -5410,7 +5409,7 @@ index 3c0c3e27d3b..11baafb9db6 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -16197,19 +16865,42 @@ SP2NL=$lt_lt_SP2NL +@@ -16196,19 +16864,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -5454,7 +5453,7 @@ index 3c0c3e27d3b..11baafb9db6 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -16239,6 +16930,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -16238,6 +16929,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -5467,7 +5466,7 @@ index 3c0c3e27d3b..11baafb9db6 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -16248,6 +16945,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -16247,6 +16944,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -5477,7 +5476,7 @@ index 3c0c3e27d3b..11baafb9db6 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -16362,12 +17062,12 @@ with_gcc=$GCC +@@ -16361,12 +17061,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -5493,7 +5492,7 @@ index 3c0c3e27d3b..11baafb9db6 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -16454,9 +17154,6 @@ inherit_rpath=$inherit_rpath +@@ -16453,9 +17153,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -5503,7 +5502,7 @@ index 3c0c3e27d3b..11baafb9db6 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -16472,6 +17169,9 @@ include_expsyms=$lt_include_expsyms +@@ -16471,6 +17168,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -5513,7 +5512,7 @@ index 3c0c3e27d3b..11baafb9db6 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -16504,210 +17204,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -16503,210 +17203,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -5916,7 +5915,7 @@ index c9914e46d7d..1857eb8b5a8 100644 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ diff --git a/gprof/configure b/gprof/configure -index c5a081c88aa..a1b06379df4 100755 +index 98ba6d7f5b3..113505b963c 100755 --- a/gprof/configure +++ b/gprof/configure @@ -663,8 +663,11 @@ OTOOL @@ -7830,7 +7829,7 @@ index c5a081c88aa..a1b06379df4 100755 chmod +x "$ofile" diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in -index a2854950e34..4d307543d81 100644 +index 06b563cb8ef..b6ae509fd6c 100644 --- a/gprofng/Makefile.in +++ b/gprofng/Makefile.in @@ -253,6 +253,7 @@ CXXFLAGS = @CXXFLAGS@ @@ -7850,10 +7849,10 @@ index a2854950e34..4d307543d81 100644 NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/gprofng/configure b/gprofng/configure -index 3ad87139280..e4593cbb838 100755 +index 69eb806a17d..9e97e334544 100755 --- a/gprofng/configure +++ b/gprofng/configure -@@ -674,6 +674,8 @@ OTOOL +@@ -672,6 +672,8 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -7862,7 +7861,7 @@ index 3ad87139280..e4593cbb838 100755 OBJDUMP LN_S NM -@@ -804,6 +806,7 @@ enable_static +@@ -802,6 +804,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -7870,7 +7869,7 @@ index 3ad87139280..e4593cbb838 100755 enable_libtool_lock enable_werror_always enable_gprofng_tools -@@ -1467,6 +1470,8 @@ Optional Packages: +@@ -1465,6 +1468,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -7879,7 +7878,7 @@ index 3ad87139280..e4593cbb838 100755 --with-jdk=PATH specify prefix directory for installed JDK. --with-system-zlib use installed libz -@@ -6158,8 +6163,8 @@ esac +@@ -6156,8 +6161,8 @@ esac @@ -7890,7 +7889,7 @@ index 3ad87139280..e4593cbb838 100755 -@@ -6199,7 +6204,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -6197,7 +6202,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -7899,7 +7898,7 @@ index 3ad87139280..e4593cbb838 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6892,8 +6897,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6890,8 +6895,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -7910,7 +7909,7 @@ index 3ad87139280..e4593cbb838 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6942,6 +6947,80 @@ esac +@@ -6940,6 +6945,80 @@ esac @@ -7991,7 +7990,7 @@ index 3ad87139280..e4593cbb838 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6958,6 +7037,11 @@ case $reload_flag in +@@ -6956,6 +7035,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -8003,7 +8002,7 @@ index 3ad87139280..e4593cbb838 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -7126,7 +7210,8 @@ mingw* | pw32*) +@@ -7124,7 +7208,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -8013,7 +8012,7 @@ index 3ad87139280..e4593cbb838 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -7280,6 +7365,21 @@ esac +@@ -7278,6 +7363,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -8035,7 +8034,7 @@ index 3ad87139280..e4593cbb838 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -7295,6 +7395,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -7293,6 +7393,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -8193,7 +8192,7 @@ index 3ad87139280..e4593cbb838 100755 plugin_option= plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" for plugin in $plugin_names; do -@@ -7309,8 +7560,10 @@ for plugin in $plugin_names; do +@@ -7307,8 +7558,10 @@ for plugin in $plugin_names; do done if test -n "$ac_tool_prefix"; then @@ -8206,7 +8205,7 @@ index 3ad87139280..e4593cbb838 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -7326,7 +7579,7 @@ do +@@ -7324,7 +7577,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -8215,7 +8214,7 @@ index 3ad87139280..e4593cbb838 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -7346,11 +7599,15 @@ $as_echo "no" >&6; } +@@ -7344,11 +7597,15 @@ $as_echo "no" >&6; } fi @@ -8234,7 +8233,7 @@ index 3ad87139280..e4593cbb838 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -7366,7 +7623,7 @@ do +@@ -7364,7 +7621,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -8243,7 +8242,7 @@ index 3ad87139280..e4593cbb838 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -7385,6 +7642,10 @@ else +@@ -7383,6 +7640,10 @@ else $as_echo "no" >&6; } fi @@ -8254,7 +8253,7 @@ index 3ad87139280..e4593cbb838 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -7396,29 +7657,81 @@ ac_tool_warned=yes ;; +@@ -7394,29 +7655,81 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -8351,7 +8350,7 @@ index 3ad87139280..e4593cbb838 100755 -@@ -7765,8 +8078,8 @@ esac +@@ -7763,8 +8076,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -8362,7 +8361,7 @@ index 3ad87139280..e4593cbb838 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -7802,6 +8115,7 @@ for ac_symprfx in "" "_"; do +@@ -7800,6 +8113,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -8370,7 +8369,7 @@ index 3ad87139280..e4593cbb838 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7843,6 +8157,18 @@ _LT_EOF +@@ -7841,6 +8155,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -8389,7 +8388,7 @@ index 3ad87139280..e4593cbb838 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7854,7 +8180,7 @@ _LT_EOF +@@ -7852,7 +8178,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -8398,7 +8397,7 @@ index 3ad87139280..e4593cbb838 100755 const char *name; void *address; } -@@ -7880,8 +8206,8 @@ static const void *lt_preloaded_setup() { +@@ -7878,8 +8204,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -8409,7 +8408,7 @@ index 3ad87139280..e4593cbb838 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7891,8 +8217,8 @@ _LT_EOF +@@ -7889,8 +8215,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -8420,7 +8419,7 @@ index 3ad87139280..e4593cbb838 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7929,6 +8255,13 @@ else +@@ -7927,6 +8253,13 @@ else $as_echo "ok" >&6; } fi @@ -8434,7 +8433,7 @@ index 3ad87139280..e4593cbb838 100755 -@@ -7948,6 +8281,48 @@ fi +@@ -7946,6 +8279,48 @@ fi @@ -8483,7 +8482,7 @@ index 3ad87139280..e4593cbb838 100755 # Check whether --enable-libtool-lock was given. -@@ -8156,6 +8531,123 @@ esac +@@ -8154,6 +8529,123 @@ esac need_locks="$enable_libtool_lock" @@ -8607,7 +8606,7 @@ index 3ad87139280..e4593cbb838 100755 case $host_os in rhapsody* | darwin*) -@@ -8719,6 +9211,8 @@ _LT_EOF +@@ -8717,6 +9209,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -8616,7 +8615,7 @@ index 3ad87139280..e4593cbb838 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8787,6 +9281,16 @@ done +@@ -8785,6 +9279,16 @@ done @@ -8633,7 +8632,7 @@ index 3ad87139280..e4593cbb838 100755 # Set options -@@ -9272,8 +9776,6 @@ fi +@@ -9270,8 +9774,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -8642,7 +8641,7 @@ index 3ad87139280..e4593cbb838 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -9439,6 +9941,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -9437,6 +9939,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -8655,7 +8654,7 @@ index 3ad87139280..e4593cbb838 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -9501,7 +10009,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -9499,7 +10007,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -8664,7 +8663,7 @@ index 3ad87139280..e4593cbb838 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -9558,13 +10066,17 @@ case $host_os in +@@ -9556,13 +10064,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -8688,7 +8687,7 @@ index 3ad87139280..e4593cbb838 100755 # # Check to make sure the PIC flag actually works. -@@ -9625,6 +10137,11 @@ fi +@@ -9623,6 +10135,11 @@ fi @@ -8700,7 +8699,7 @@ index 3ad87139280..e4593cbb838 100755 # # Check to make sure the static flag actually works. # -@@ -9975,7 +10492,8 @@ _LT_EOF +@@ -9973,7 +10490,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -8710,7 +8709,7 @@ index 3ad87139280..e4593cbb838 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -10074,12 +10592,12 @@ _LT_EOF +@@ -10072,12 +10590,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -8725,7 +8724,7 @@ index 3ad87139280..e4593cbb838 100755 fi ;; esac -@@ -10093,8 +10611,8 @@ _LT_EOF +@@ -10091,8 +10609,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -8736,7 +8735,7 @@ index 3ad87139280..e4593cbb838 100755 fi ;; -@@ -10112,8 +10630,8 @@ _LT_EOF +@@ -10110,8 +10628,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -8747,7 +8746,7 @@ index 3ad87139280..e4593cbb838 100755 else ld_shlibs=no fi -@@ -10159,8 +10677,8 @@ _LT_EOF +@@ -10157,8 +10675,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -8758,7 +8757,7 @@ index 3ad87139280..e4593cbb838 100755 else ld_shlibs=no fi -@@ -10290,7 +10808,13 @@ _LT_EOF +@@ -10288,7 +10806,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -8773,7 +8772,7 @@ index 3ad87139280..e4593cbb838 100755 /* end confdefs.h. */ int -@@ -10303,22 +10827,29 @@ main () +@@ -10301,22 +10825,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -8816,7 +8815,7 @@ index 3ad87139280..e4593cbb838 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -10330,7 +10861,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10328,7 +10859,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -8831,7 +8830,7 @@ index 3ad87139280..e4593cbb838 100755 /* end confdefs.h. */ int -@@ -10343,22 +10880,29 @@ main () +@@ -10341,22 +10878,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -8874,7 +8873,7 @@ index 3ad87139280..e4593cbb838 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -10403,20 +10947,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10401,20 +10945,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -8952,7 +8951,7 @@ index 3ad87139280..e4593cbb838 100755 ;; darwin* | rhapsody*) -@@ -10477,7 +11064,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10475,7 +11062,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -8961,7 +8960,7 @@ index 3ad87139280..e4593cbb838 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -10485,7 +11072,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10483,7 +11070,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -8970,7 +8969,7 @@ index 3ad87139280..e4593cbb838 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -10501,7 +11088,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10499,7 +11086,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -8979,7 +8978,7 @@ index 3ad87139280..e4593cbb838 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -10525,10 +11112,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10523,10 +11110,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -8992,7 +8991,7 @@ index 3ad87139280..e4593cbb838 100755 ;; esac else -@@ -10607,23 +11194,36 @@ fi +@@ -10605,23 +11192,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -9037,7 +9036,7 @@ index 3ad87139280..e4593cbb838 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10708,7 +11308,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10706,7 +11306,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -9046,7 +9045,7 @@ index 3ad87139280..e4593cbb838 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10727,9 +11327,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10725,9 +11325,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -9058,7 +9057,7 @@ index 3ad87139280..e4593cbb838 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -11305,8 +11905,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -11303,8 +11903,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -9070,7 +9069,7 @@ index 3ad87139280..e4593cbb838 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -11339,13 +11940,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -11337,13 +11938,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -9143,16 +9142,16 @@ index 3ad87139280..e4593cbb838 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -12223,7 +12882,7 @@ else +@@ -12221,7 +12880,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12226 "configure" +-#line 12224 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12267,10 +12926,10 @@ else +@@ -12265,10 +12924,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -9165,16 +9164,16 @@ index 3ad87139280..e4593cbb838 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12329,7 +12988,7 @@ else +@@ -12327,7 +12986,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12332 "configure" +-#line 12330 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12373,10 +13032,10 @@ else +@@ -12371,10 +13030,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -9187,7 +9186,7 @@ index 3ad87139280..e4593cbb838 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12768,6 +13427,7 @@ $RM -r conftest* +@@ -12766,6 +13425,7 @@ $RM -r conftest* # Allow CC to be a program name with arguments. lt_save_CC=$CC @@ -9195,7 +9194,7 @@ index 3ad87139280..e4593cbb838 100755 lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX -@@ -12785,6 +13445,7 @@ $RM -r conftest* +@@ -12783,6 +13443,7 @@ $RM -r conftest* fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} @@ -9203,7 +9202,7 @@ index 3ad87139280..e4593cbb838 100755 compiler=$CC compiler_CXX=$CC for cc_temp in $compiler""; do -@@ -13067,7 +13728,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie +@@ -13065,7 +13726,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -9218,7 +9217,7 @@ index 3ad87139280..e4593cbb838 100755 /* end confdefs.h. */ int -@@ -13080,22 +13747,29 @@ main () +@@ -13078,22 +13745,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -9261,7 +9260,7 @@ index 3ad87139280..e4593cbb838 100755 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -13108,7 +13782,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13106,7 +13780,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -9276,7 +9275,7 @@ index 3ad87139280..e4593cbb838 100755 /* end confdefs.h. */ int -@@ -13121,22 +13801,29 @@ main () +@@ -13119,22 +13799,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -9319,7 +9318,7 @@ index 3ad87139280..e4593cbb838 100755 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -13179,29 +13866,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13177,29 +13864,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; cygwin* | mingw* | pw32* | cegcc*) @@ -9418,7 +9417,7 @@ index 3ad87139280..e4593cbb838 100755 darwin* | rhapsody*) -@@ -13307,7 +14040,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13305,7 +14038,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; *) if test "$GXX" = yes; then @@ -9427,7 +9426,7 @@ index 3ad87139280..e4593cbb838 100755 else # FIXME: insert proper C++ library support ld_shlibs_CXX=no -@@ -13378,10 +14111,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13376,10 +14109,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) @@ -9440,7 +9439,7 @@ index 3ad87139280..e4593cbb838 100755 ;; esac fi -@@ -13422,9 +14155,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13420,9 +14153,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then @@ -9452,7 +9451,7 @@ index 3ad87139280..e4593cbb838 100755 fi fi link_all_deplibs_CXX=yes -@@ -13494,20 +14227,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13492,20 +14225,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi prelink_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ @@ -9477,7 +9476,7 @@ index 3ad87139280..e4593cbb838 100755 ;; *) # Version 6 and above use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -13702,7 +14435,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13700,7 +14433,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) @@ -9486,7 +9485,7 @@ index 3ad87139280..e4593cbb838 100755 ;; esac -@@ -13748,7 +14481,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13746,7 +14479,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi solaris*) case $cc_basename in @@ -9495,7 +9494,7 @@ index 3ad87139280..e4593cbb838 100755 # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' -@@ -13789,9 +14522,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13787,9 +14520,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then @@ -9507,7 +9506,7 @@ index 3ad87139280..e4593cbb838 100755 # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -13926,6 +14659,13 @@ private: +@@ -13924,6 +14657,13 @@ private: }; _LT_EOF @@ -9521,7 +9520,7 @@ index 3ad87139280..e4593cbb838 100755 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? -@@ -13939,7 +14679,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13937,7 +14677,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do @@ -9530,7 +9529,7 @@ index 3ad87139280..e4593cbb838 100755 -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. -@@ -13948,13 +14688,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13946,13 +14686,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 test $p = "-R"; then prev=$p continue @@ -9557,7 +9556,7 @@ index 3ad87139280..e4593cbb838 100755 # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. -@@ -13974,8 +14723,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13972,8 +14721,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 postdeps_CXX="${postdeps_CXX} ${prev}${p}" fi fi @@ -9568,7 +9567,7 @@ index 3ad87139280..e4593cbb838 100755 *.$objext) # This assumes that the test object file only shows up # once in the compiler output. -@@ -14011,6 +14762,7 @@ else +@@ -14009,6 +14760,7 @@ else fi $RM -f confest.$objext @@ -9576,7 +9575,7 @@ index 3ad87139280..e4593cbb838 100755 # PORTME: override above test on systems where it is broken case $host_os in -@@ -14046,7 +14798,7 @@ linux*) +@@ -14044,7 +14796,7 @@ linux*) solaris*) case $cc_basename in @@ -9585,7 +9584,7 @@ index 3ad87139280..e4593cbb838 100755 # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as -@@ -14111,8 +14863,6 @@ fi +@@ -14109,8 +14861,6 @@ fi lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= @@ -9594,7 +9593,7 @@ index 3ad87139280..e4593cbb838 100755 # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then -@@ -14217,6 +14967,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -14215,6 +14965,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; esac ;; @@ -9606,7 +9605,7 @@ index 3ad87139280..e4593cbb838 100755 dgux*) case $cc_basename in ec++*) -@@ -14369,7 +15124,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -14367,7 +15122,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; solaris*) case $cc_basename in @@ -9615,7 +9614,7 @@ index 3ad87139280..e4593cbb838 100755 # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' -@@ -14434,10 +15189,17 @@ case $host_os in +@@ -14432,10 +15187,17 @@ case $host_os in lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac @@ -9636,7 +9635,7 @@ index 3ad87139280..e4593cbb838 100755 # # Check to make sure the PIC flag actually works. -@@ -14495,6 +15257,8 @@ fi +@@ -14493,6 +15255,8 @@ fi @@ -9645,7 +9644,7 @@ index 3ad87139280..e4593cbb838 100755 # # Check to make sure the static flag actually works. # -@@ -14672,6 +15436,7 @@ fi +@@ -14670,6 +15434,7 @@ fi $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -9653,7 +9652,7 @@ index 3ad87139280..e4593cbb838 100755 case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. -@@ -14686,15 +15451,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie +@@ -14684,15 +15449,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; pw32*) export_symbols_cmds_CXX="$ltdll_cmds" @@ -9679,7 +9678,7 @@ index 3ad87139280..e4593cbb838 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } -@@ -14957,8 +15727,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14955,8 +15725,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -9691,7 +9690,7 @@ index 3ad87139280..e4593cbb838 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -14990,13 +15761,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14988,13 +15759,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -9764,7 +9763,7 @@ index 3ad87139280..e4593cbb838 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -15536,6 +16365,7 @@ fi +@@ -15534,6 +16363,7 @@ fi fi # test -n "$compiler" CC=$lt_save_CC @@ -9772,7 +9771,7 @@ index 3ad87139280..e4593cbb838 100755 LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC -@@ -17751,13 +18581,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -17737,13 +18567,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -9793,7 +9792,7 @@ index 3ad87139280..e4593cbb838 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -17772,14 +18609,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -17758,14 +18595,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -9812,7 +9811,7 @@ index 3ad87139280..e4593cbb838 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -17812,12 +18652,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -17798,12 +18638,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -9826,7 +9825,7 @@ index 3ad87139280..e4593cbb838 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -17856,8 +18696,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote +@@ -17842,8 +18682,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' @@ -9836,7 +9835,7 @@ index 3ad87139280..e4593cbb838 100755 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -@@ -17884,12 +18724,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ +@@ -17870,12 +18710,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' @@ -9850,7 +9849,7 @@ index 3ad87139280..e4593cbb838 100755 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -@@ -17927,8 +18767,13 @@ reload_flag \ +@@ -17913,8 +18753,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -9864,7 +9863,7 @@ index 3ad87139280..e4593cbb838 100755 STRIP \ RANLIB \ CC \ -@@ -17938,12 +18783,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -17924,12 +18769,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -9880,7 +9879,7 @@ index 3ad87139280..e4593cbb838 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -17959,7 +18806,6 @@ no_undefined_flag \ +@@ -17945,7 +18792,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -9888,7 +9887,7 @@ index 3ad87139280..e4593cbb838 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -17981,8 +18827,8 @@ LD_CXX \ +@@ -17967,8 +18813,8 @@ LD_CXX \ reload_flag_CXX \ compiler_CXX \ lt_prog_compiler_no_builtin_flag_CXX \ @@ -9898,7 +9897,7 @@ index 3ad87139280..e4593cbb838 100755 lt_prog_compiler_static_CXX \ lt_cv_prog_compiler_c_o_CXX \ export_dynamic_flag_spec_CXX \ -@@ -17994,7 +18840,6 @@ no_undefined_flag_CXX \ +@@ -17980,7 +18826,6 @@ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ @@ -9906,7 +9905,7 @@ index 3ad87139280..e4593cbb838 100755 exclude_expsyms_CXX \ include_expsyms_CXX \ file_list_spec_CXX \ -@@ -18028,6 +18873,7 @@ module_cmds \ +@@ -18014,6 +18859,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -9914,7 +9913,7 @@ index 3ad87139280..e4593cbb838 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -18042,7 +18888,8 @@ archive_expsym_cmds_CXX \ +@@ -18028,7 +18874,8 @@ archive_expsym_cmds_CXX \ module_cmds_CXX \ module_expsym_cmds_CXX \ export_symbols_cmds_CXX \ @@ -9924,7 +9923,7 @@ index 3ad87139280..e4593cbb838 100755 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -@@ -18799,7 +19646,8 @@ $as_echo X"$file" | +@@ -18785,7 +19632,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -9934,7 +9933,7 @@ index 3ad87139280..e4593cbb838 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -18902,19 +19750,42 @@ SP2NL=$lt_lt_SP2NL +@@ -18888,19 +19736,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -9978,7 +9977,7 @@ index 3ad87139280..e4593cbb838 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -18944,6 +19815,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -18930,6 +19801,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -9991,7 +9990,7 @@ index 3ad87139280..e4593cbb838 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -18953,6 +19830,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -18939,6 +19816,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -10001,7 +10000,7 @@ index 3ad87139280..e4593cbb838 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -19067,12 +19947,12 @@ with_gcc=$GCC +@@ -19053,12 +19933,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -10017,7 +10016,7 @@ index 3ad87139280..e4593cbb838 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -19159,9 +20039,6 @@ inherit_rpath=$inherit_rpath +@@ -19145,9 +20025,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -10027,7 +10026,7 @@ index 3ad87139280..e4593cbb838 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -19177,6 +20054,9 @@ include_expsyms=$lt_include_expsyms +@@ -19163,6 +20040,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -10037,7 +10036,7 @@ index 3ad87139280..e4593cbb838 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -19223,210 +20103,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -19209,210 +20089,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -10411,7 +10410,7 @@ index 3ad87139280..e4593cbb838 100755 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -@@ -19454,12 +20293,12 @@ with_gcc=$GCC_CXX +@@ -19440,12 +20279,12 @@ with_gcc=$GCC_CXX # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX @@ -10427,7 +10426,7 @@ index 3ad87139280..e4593cbb838 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static_CXX -@@ -19546,9 +20385,6 @@ inherit_rpath=$inherit_rpath_CXX +@@ -19532,9 +20371,6 @@ inherit_rpath=$inherit_rpath_CXX # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs_CXX @@ -10437,7 +10436,7 @@ index 3ad87139280..e4593cbb838 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols_CXX -@@ -19564,6 +20400,9 @@ include_expsyms=$lt_include_expsyms_CXX +@@ -19550,6 +20386,9 @@ include_expsyms=$lt_include_expsyms_CXX # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds_CXX @@ -10448,10 +10447,10 @@ index 3ad87139280..e4593cbb838 100755 file_list_spec=$lt_file_list_spec_CXX diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in -index 3cd2068cbf6..c5d431236aa 100644 +index 78f8ae11fc7..48058763422 100644 --- a/gprofng/doc/Makefile.in +++ b/gprofng/doc/Makefile.in -@@ -240,6 +240,7 @@ CXXFLAGS = @CXXFLAGS@ +@@ -238,6 +238,7 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -10459,7 +10458,7 @@ index 3cd2068cbf6..c5d431236aa 100644 DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ -@@ -275,6 +276,7 @@ LN_S = @LN_S@ +@@ -273,6 +274,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ @@ -10468,10 +10467,10 @@ index 3cd2068cbf6..c5d431236aa 100644 NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in -index 42886f7c645..b7e31ded46a 100644 +index 21cc1c6623b..e989804603e 100644 --- a/gprofng/gp-display-html/Makefile.in +++ b/gprofng/gp-display-html/Makefile.in -@@ -200,6 +200,7 @@ CXXFLAGS = @CXXFLAGS@ +@@ -197,6 +197,7 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -10479,7 +10478,7 @@ index 42886f7c645..b7e31ded46a 100644 DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ -@@ -235,6 +236,7 @@ LN_S = @LN_S@ +@@ -232,6 +233,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ @@ -10488,7 +10487,7 @@ index 42886f7c645..b7e31ded46a 100644 NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in -index eef61ba85f7..0eb1521b704 100644 +index dc76a76bd67..763b08822f2 100644 --- a/gprofng/libcollector/Makefile.in +++ b/gprofng/libcollector/Makefile.in @@ -316,6 +316,7 @@ CXXFLAGS = @CXXFLAGS@ @@ -10499,7 +10498,7 @@ index eef61ba85f7..0eb1521b704 100644 DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ -@@ -342,6 +343,7 @@ LN_S = @LN_S@ +@@ -341,6 +342,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ @@ -10508,10 +10507,10 @@ index eef61ba85f7..0eb1521b704 100644 NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/gprofng/libcollector/configure b/gprofng/libcollector/configure -index 079a0b71ec3..a28289cfe9d 100755 +index 865ddb3d91d..31533528ee2 100755 --- a/gprofng/libcollector/configure +++ b/gprofng/libcollector/configure -@@ -641,6 +641,8 @@ OTOOL +@@ -640,6 +640,8 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -10520,7 +10519,7 @@ index 079a0b71ec3..a28289cfe9d 100755 OBJDUMP LN_S NM -@@ -770,6 +772,7 @@ enable_static +@@ -769,6 +771,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -10528,7 +10527,7 @@ index 079a0b71ec3..a28289cfe9d 100755 enable_libtool_lock ' ac_precious_vars='build_alias -@@ -1425,6 +1428,8 @@ Optional Packages: +@@ -1424,6 +1427,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -10537,7 +10536,7 @@ index 079a0b71ec3..a28289cfe9d 100755 Some influential environment variables: CC C compiler command -@@ -5969,8 +5974,8 @@ esac +@@ -5968,8 +5973,8 @@ esac @@ -10548,7 +10547,7 @@ index 079a0b71ec3..a28289cfe9d 100755 -@@ -6010,7 +6015,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -6009,7 +6014,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -10557,7 +10556,7 @@ index 079a0b71ec3..a28289cfe9d 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6703,8 +6708,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6702,8 +6707,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -10568,7 +10567,7 @@ index 079a0b71ec3..a28289cfe9d 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6753,6 +6758,80 @@ esac +@@ -6752,6 +6757,80 @@ esac @@ -10649,7 +10648,7 @@ index 079a0b71ec3..a28289cfe9d 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6769,6 +6848,11 @@ case $reload_flag in +@@ -6768,6 +6847,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -10661,7 +10660,7 @@ index 079a0b71ec3..a28289cfe9d 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6937,7 +7021,8 @@ mingw* | pw32*) +@@ -6936,7 +7020,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -10671,7 +10670,7 @@ index 079a0b71ec3..a28289cfe9d 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -7091,6 +7176,21 @@ esac +@@ -7090,6 +7175,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -10693,7 +10692,7 @@ index 079a0b71ec3..a28289cfe9d 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -7106,6 +7206,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -7105,6 +7205,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -10851,7 +10850,7 @@ index 079a0b71ec3..a28289cfe9d 100755 plugin_option= plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" for plugin in $plugin_names; do -@@ -7120,8 +7371,10 @@ for plugin in $plugin_names; do +@@ -7119,8 +7370,10 @@ for plugin in $plugin_names; do done if test -n "$ac_tool_prefix"; then @@ -10864,7 +10863,7 @@ index 079a0b71ec3..a28289cfe9d 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -7137,7 +7390,7 @@ do +@@ -7136,7 +7389,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -10873,7 +10872,7 @@ index 079a0b71ec3..a28289cfe9d 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -7157,11 +7410,15 @@ $as_echo "no" >&6; } +@@ -7156,11 +7409,15 @@ $as_echo "no" >&6; } fi @@ -10892,7 +10891,7 @@ index 079a0b71ec3..a28289cfe9d 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -7177,7 +7434,7 @@ do +@@ -7176,7 +7433,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -10901,7 +10900,7 @@ index 079a0b71ec3..a28289cfe9d 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -7196,6 +7453,10 @@ else +@@ -7195,6 +7452,10 @@ else $as_echo "no" >&6; } fi @@ -10912,7 +10911,7 @@ index 079a0b71ec3..a28289cfe9d 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -7207,29 +7468,81 @@ ac_tool_warned=yes ;; +@@ -7206,29 +7467,81 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -11009,7 +11008,7 @@ index 079a0b71ec3..a28289cfe9d 100755 -@@ -7576,8 +7889,8 @@ esac +@@ -7575,8 +7888,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -11020,7 +11019,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -7613,6 +7926,7 @@ for ac_symprfx in "" "_"; do +@@ -7612,6 +7925,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -11028,7 +11027,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7654,6 +7968,18 @@ _LT_EOF +@@ -7653,6 +7967,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -11047,7 +11046,7 @@ index 079a0b71ec3..a28289cfe9d 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7665,7 +7991,7 @@ _LT_EOF +@@ -7664,7 +7990,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -11056,7 +11055,7 @@ index 079a0b71ec3..a28289cfe9d 100755 const char *name; void *address; } -@@ -7691,8 +8017,8 @@ static const void *lt_preloaded_setup() { +@@ -7690,8 +8016,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -11067,7 +11066,7 @@ index 079a0b71ec3..a28289cfe9d 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7702,8 +8028,8 @@ _LT_EOF +@@ -7701,8 +8027,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -11078,7 +11077,7 @@ index 079a0b71ec3..a28289cfe9d 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7740,6 +8066,13 @@ else +@@ -7739,6 +8065,13 @@ else $as_echo "ok" >&6; } fi @@ -11092,7 +11091,7 @@ index 079a0b71ec3..a28289cfe9d 100755 -@@ -7759,6 +8092,48 @@ fi +@@ -7758,6 +8091,48 @@ fi @@ -11141,7 +11140,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # Check whether --enable-libtool-lock was given. -@@ -7967,6 +8342,123 @@ esac +@@ -7966,6 +8341,123 @@ esac need_locks="$enable_libtool_lock" @@ -11265,7 +11264,7 @@ index 079a0b71ec3..a28289cfe9d 100755 case $host_os in rhapsody* | darwin*) -@@ -8530,6 +9022,8 @@ _LT_EOF +@@ -8529,6 +9021,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -11274,7 +11273,7 @@ index 079a0b71ec3..a28289cfe9d 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8598,6 +9092,16 @@ done +@@ -8597,6 +9091,16 @@ done @@ -11291,7 +11290,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # Set options -@@ -9113,8 +9617,6 @@ fi +@@ -9112,8 +9616,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -11300,7 +11299,7 @@ index 079a0b71ec3..a28289cfe9d 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -9280,6 +9782,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -9279,6 +9781,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -11313,7 +11312,7 @@ index 079a0b71ec3..a28289cfe9d 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -9342,7 +9850,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -9341,7 +9849,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -11322,7 +11321,7 @@ index 079a0b71ec3..a28289cfe9d 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -9399,13 +9907,17 @@ case $host_os in +@@ -9398,13 +9906,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -11346,7 +11345,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # # Check to make sure the PIC flag actually works. -@@ -9466,6 +9978,11 @@ fi +@@ -9465,6 +9977,11 @@ fi @@ -11358,7 +11357,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # # Check to make sure the static flag actually works. # -@@ -9816,7 +10333,8 @@ _LT_EOF +@@ -9815,7 +10332,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -11368,7 +11367,7 @@ index 079a0b71ec3..a28289cfe9d 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9915,12 +10433,12 @@ _LT_EOF +@@ -9914,12 +10432,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -11383,7 +11382,7 @@ index 079a0b71ec3..a28289cfe9d 100755 fi ;; esac -@@ -9934,8 +10452,8 @@ _LT_EOF +@@ -9933,8 +10451,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -11394,7 +11393,7 @@ index 079a0b71ec3..a28289cfe9d 100755 fi ;; -@@ -9953,8 +10471,8 @@ _LT_EOF +@@ -9952,8 +10470,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -11405,7 +11404,7 @@ index 079a0b71ec3..a28289cfe9d 100755 else ld_shlibs=no fi -@@ -10000,8 +10518,8 @@ _LT_EOF +@@ -9999,8 +10517,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -11416,7 +11415,7 @@ index 079a0b71ec3..a28289cfe9d 100755 else ld_shlibs=no fi -@@ -10131,7 +10649,13 @@ _LT_EOF +@@ -10130,7 +10648,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -11431,7 +11430,7 @@ index 079a0b71ec3..a28289cfe9d 100755 /* end confdefs.h. */ int -@@ -10144,22 +10668,29 @@ main () +@@ -10143,22 +10667,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -11474,7 +11473,7 @@ index 079a0b71ec3..a28289cfe9d 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -10171,7 +10702,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10170,7 +10701,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -11489,7 +11488,7 @@ index 079a0b71ec3..a28289cfe9d 100755 /* end confdefs.h. */ int -@@ -10184,22 +10721,29 @@ main () +@@ -10183,22 +10720,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -11532,7 +11531,7 @@ index 079a0b71ec3..a28289cfe9d 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -10243,21 +10787,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10242,21 +10786,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -11612,7 +11611,7 @@ index 079a0b71ec3..a28289cfe9d 100755 ;; darwin* | rhapsody*) -@@ -10318,7 +10905,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10317,7 +10904,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -11621,7 +11620,7 @@ index 079a0b71ec3..a28289cfe9d 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -10326,7 +10913,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10325,7 +10912,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -11630,7 +11629,7 @@ index 079a0b71ec3..a28289cfe9d 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -10342,7 +10929,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10341,7 +10928,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -11639,7 +11638,7 @@ index 079a0b71ec3..a28289cfe9d 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -10366,10 +10953,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10365,10 +10952,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -11652,7 +11651,7 @@ index 079a0b71ec3..a28289cfe9d 100755 ;; esac else -@@ -10448,23 +11035,36 @@ fi +@@ -10447,23 +11034,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -11697,7 +11696,7 @@ index 079a0b71ec3..a28289cfe9d 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10549,7 +11149,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10548,7 +11148,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -11706,7 +11705,7 @@ index 079a0b71ec3..a28289cfe9d 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10568,9 +11168,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10567,9 +11167,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -11718,7 +11717,7 @@ index 079a0b71ec3..a28289cfe9d 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -11146,8 +11746,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -11145,8 +11745,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -11730,7 +11729,7 @@ index 079a0b71ec3..a28289cfe9d 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -11180,13 +11781,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -11179,13 +11780,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -11803,16 +11802,16 @@ index 079a0b71ec3..a28289cfe9d 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -12064,7 +12723,7 @@ else +@@ -12063,7 +12722,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12067 "configure" +-#line 12066 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12108,10 +12767,10 @@ else +@@ -12107,10 +12766,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -11825,16 +11824,16 @@ index 079a0b71ec3..a28289cfe9d 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12170,7 +12829,7 @@ else +@@ -12169,7 +12828,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12173 "configure" +-#line 12172 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12214,10 +12873,10 @@ else +@@ -12213,10 +12872,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -11847,7 +11846,7 @@ index 079a0b71ec3..a28289cfe9d 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12609,6 +13268,7 @@ $RM -r conftest* +@@ -12608,6 +13267,7 @@ $RM -r conftest* # Allow CC to be a program name with arguments. lt_save_CC=$CC @@ -11855,7 +11854,7 @@ index 079a0b71ec3..a28289cfe9d 100755 lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX -@@ -12626,6 +13286,7 @@ $RM -r conftest* +@@ -12625,6 +13285,7 @@ $RM -r conftest* fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} @@ -11863,7 +11862,7 @@ index 079a0b71ec3..a28289cfe9d 100755 compiler=$CC compiler_CXX=$CC for cc_temp in $compiler""; do -@@ -12908,7 +13569,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie +@@ -12907,7 +13568,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -11878,7 +11877,7 @@ index 079a0b71ec3..a28289cfe9d 100755 /* end confdefs.h. */ int -@@ -12921,22 +13588,29 @@ main () +@@ -12920,22 +13587,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -11921,7 +11920,7 @@ index 079a0b71ec3..a28289cfe9d 100755 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -12949,7 +13623,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12948,7 +13622,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -11936,7 +11935,7 @@ index 079a0b71ec3..a28289cfe9d 100755 /* end confdefs.h. */ int -@@ -12962,22 +13642,29 @@ main () +@@ -12961,22 +13641,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -11979,7 +11978,7 @@ index 079a0b71ec3..a28289cfe9d 100755 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -13020,29 +13707,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13019,29 +13706,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; cygwin* | mingw* | pw32* | cegcc*) @@ -12078,7 +12077,7 @@ index 079a0b71ec3..a28289cfe9d 100755 darwin* | rhapsody*) -@@ -13148,7 +13881,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13147,7 +13880,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; *) if test "$GXX" = yes; then @@ -12087,7 +12086,7 @@ index 079a0b71ec3..a28289cfe9d 100755 else # FIXME: insert proper C++ library support ld_shlibs_CXX=no -@@ -13219,10 +13952,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13218,10 +13951,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) @@ -12100,7 +12099,7 @@ index 079a0b71ec3..a28289cfe9d 100755 ;; esac fi -@@ -13263,9 +13996,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13262,9 +13995,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then @@ -12112,7 +12111,7 @@ index 079a0b71ec3..a28289cfe9d 100755 fi fi link_all_deplibs_CXX=yes -@@ -13335,20 +14068,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13334,20 +14067,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi prelink_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ @@ -12137,7 +12136,7 @@ index 079a0b71ec3..a28289cfe9d 100755 ;; *) # Version 6 and above use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -13543,7 +14276,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13542,7 +14275,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) @@ -12146,7 +12145,7 @@ index 079a0b71ec3..a28289cfe9d 100755 ;; esac -@@ -13589,7 +14322,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13588,7 +14321,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi solaris*) case $cc_basename in @@ -12155,7 +12154,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' -@@ -13630,9 +14363,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13629,9 +14362,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then @@ -12167,7 +12166,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -13767,6 +14500,13 @@ private: +@@ -13766,6 +14499,13 @@ private: }; _LT_EOF @@ -12181,7 +12180,7 @@ index 079a0b71ec3..a28289cfe9d 100755 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? -@@ -13780,7 +14520,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13779,7 +14519,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do @@ -12190,7 +12189,7 @@ index 079a0b71ec3..a28289cfe9d 100755 -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. -@@ -13789,13 +14529,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13788,13 +14528,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 test $p = "-R"; then prev=$p continue @@ -12217,7 +12216,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. -@@ -13815,8 +14564,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13814,8 +14563,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 postdeps_CXX="${postdeps_CXX} ${prev}${p}" fi fi @@ -12228,7 +12227,7 @@ index 079a0b71ec3..a28289cfe9d 100755 *.$objext) # This assumes that the test object file only shows up # once in the compiler output. -@@ -13852,6 +14603,7 @@ else +@@ -13851,6 +14602,7 @@ else fi $RM -f confest.$objext @@ -12236,7 +12235,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # PORTME: override above test on systems where it is broken case $host_os in -@@ -13887,7 +14639,7 @@ linux*) +@@ -13886,7 +14638,7 @@ linux*) solaris*) case $cc_basename in @@ -12245,7 +12244,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as -@@ -13952,8 +14704,6 @@ fi +@@ -13951,8 +14703,6 @@ fi lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= @@ -12254,7 +12253,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then -@@ -14058,6 +14808,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -14057,6 +14807,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; esac ;; @@ -12266,7 +12265,7 @@ index 079a0b71ec3..a28289cfe9d 100755 dgux*) case $cc_basename in ec++*) -@@ -14210,7 +14965,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -14209,7 +14964,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; solaris*) case $cc_basename in @@ -12275,7 +12274,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' -@@ -14275,10 +15030,17 @@ case $host_os in +@@ -14274,10 +15029,17 @@ case $host_os in lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac @@ -12296,7 +12295,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # # Check to make sure the PIC flag actually works. -@@ -14336,6 +15098,8 @@ fi +@@ -14335,6 +15097,8 @@ fi @@ -12305,7 +12304,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # # Check to make sure the static flag actually works. # -@@ -14513,6 +15277,7 @@ fi +@@ -14512,6 +15276,7 @@ fi $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -12313,7 +12312,7 @@ index 079a0b71ec3..a28289cfe9d 100755 case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. -@@ -14527,15 +15292,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie +@@ -14526,15 +15291,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; pw32*) export_symbols_cmds_CXX="$ltdll_cmds" @@ -12339,7 +12338,7 @@ index 079a0b71ec3..a28289cfe9d 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } -@@ -14798,8 +15568,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14797,8 +15567,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -12351,7 +12350,7 @@ index 079a0b71ec3..a28289cfe9d 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -14831,13 +15602,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14830,13 +15601,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -12424,7 +12423,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -15377,6 +16206,7 @@ fi +@@ -15376,6 +16205,7 @@ fi fi # test -n "$compiler" CC=$lt_save_CC @@ -12432,7 +12431,7 @@ index 079a0b71ec3..a28289cfe9d 100755 LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC -@@ -16321,13 +17151,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -16303,13 +17133,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -12453,7 +12452,7 @@ index 079a0b71ec3..a28289cfe9d 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -16342,14 +17179,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -16324,14 +17161,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -12472,7 +12471,7 @@ index 079a0b71ec3..a28289cfe9d 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -16382,12 +17222,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -16364,12 +17204,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -12486,7 +12485,7 @@ index 079a0b71ec3..a28289cfe9d 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16426,8 +17266,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote +@@ -16408,8 +17248,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' @@ -12496,7 +12495,7 @@ index 079a0b71ec3..a28289cfe9d 100755 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -@@ -16454,12 +17294,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ +@@ -16436,12 +17276,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' @@ -12510,7 +12509,7 @@ index 079a0b71ec3..a28289cfe9d 100755 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -@@ -16497,8 +17337,13 @@ reload_flag \ +@@ -16479,8 +17319,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -12524,7 +12523,7 @@ index 079a0b71ec3..a28289cfe9d 100755 STRIP \ RANLIB \ CC \ -@@ -16508,12 +17353,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -16490,12 +17335,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -12540,7 +12539,7 @@ index 079a0b71ec3..a28289cfe9d 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -16529,7 +17376,6 @@ no_undefined_flag \ +@@ -16511,7 +17358,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -12548,7 +12547,7 @@ index 079a0b71ec3..a28289cfe9d 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -16551,8 +17397,8 @@ LD_CXX \ +@@ -16533,8 +17379,8 @@ LD_CXX \ reload_flag_CXX \ compiler_CXX \ lt_prog_compiler_no_builtin_flag_CXX \ @@ -12558,7 +12557,7 @@ index 079a0b71ec3..a28289cfe9d 100755 lt_prog_compiler_static_CXX \ lt_cv_prog_compiler_c_o_CXX \ export_dynamic_flag_spec_CXX \ -@@ -16564,7 +17410,6 @@ no_undefined_flag_CXX \ +@@ -16546,7 +17392,6 @@ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ @@ -12566,7 +12565,7 @@ index 079a0b71ec3..a28289cfe9d 100755 exclude_expsyms_CXX \ include_expsyms_CXX \ file_list_spec_CXX \ -@@ -16598,6 +17443,7 @@ module_cmds \ +@@ -16580,6 +17425,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -12574,7 +12573,7 @@ index 079a0b71ec3..a28289cfe9d 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -16612,7 +17458,8 @@ archive_expsym_cmds_CXX \ +@@ -16594,7 +17440,8 @@ archive_expsym_cmds_CXX \ module_cmds_CXX \ module_expsym_cmds_CXX \ export_symbols_cmds_CXX \ @@ -12584,7 +12583,7 @@ index 079a0b71ec3..a28289cfe9d 100755 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -@@ -17366,7 +18213,8 @@ $as_echo X"$file" | +@@ -17348,7 +18195,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -12594,7 +12593,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -17469,19 +18317,42 @@ SP2NL=$lt_lt_SP2NL +@@ -17451,19 +18299,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -12638,7 +12637,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -17511,6 +18382,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -17493,6 +18364,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -12651,7 +12650,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -17520,6 +18397,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -17502,6 +18379,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -12661,7 +12660,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -17634,12 +18514,12 @@ with_gcc=$GCC +@@ -17616,12 +18496,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -12677,7 +12676,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -17726,9 +18606,6 @@ inherit_rpath=$inherit_rpath +@@ -17708,9 +18588,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -12687,7 +12686,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -17744,6 +18621,9 @@ include_expsyms=$lt_include_expsyms +@@ -17726,6 +18603,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -12697,7 +12696,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -17790,210 +18670,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -17772,210 +18652,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -13071,7 +13070,7 @@ index 079a0b71ec3..a28289cfe9d 100755 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -@@ -18021,12 +18860,12 @@ with_gcc=$GCC_CXX +@@ -18003,12 +18842,12 @@ with_gcc=$GCC_CXX # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX @@ -13087,7 +13086,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static_CXX -@@ -18113,9 +18952,6 @@ inherit_rpath=$inherit_rpath_CXX +@@ -18095,9 +18934,6 @@ inherit_rpath=$inherit_rpath_CXX # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs_CXX @@ -13097,7 +13096,7 @@ index 079a0b71ec3..a28289cfe9d 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols_CXX -@@ -18131,6 +18967,9 @@ include_expsyms=$lt_include_expsyms_CXX +@@ -18113,6 +18949,9 @@ include_expsyms=$lt_include_expsyms_CXX # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds_CXX @@ -13108,10 +13107,10 @@ index 079a0b71ec3..a28289cfe9d 100755 file_list_spec=$lt_file_list_spec_CXX diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in -index 605fa4f6fd4..313c4ceb4ca 100644 +index b881268b0d9..cfc98458e79 100644 --- a/gprofng/src/Makefile.in +++ b/gprofng/src/Makefile.in -@@ -324,6 +324,7 @@ CXXFLAGS = @CXXFLAGS@ +@@ -321,6 +321,7 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -13119,7 +13118,7 @@ index 605fa4f6fd4..313c4ceb4ca 100644 DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ -@@ -359,6 +360,7 @@ LN_S = @LN_S@ +@@ -356,6 +357,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ @@ -13128,7 +13127,7 @@ index 605fa4f6fd4..313c4ceb4ca 100644 NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/ld/Makefile.in b/ld/Makefile.in -index 08dcd7b75fc..17c58dd2fd0 100644 +index c21c554e432..729e1f47e85 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -384,6 +384,7 @@ CYGPATH_W = @CYGPATH_W@ @@ -13156,7 +13155,7 @@ index 08dcd7b75fc..17c58dd2fd0 100644 ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ diff --git a/ld/configure b/ld/configure -index 6406a42c442..21ab5b06709 100755 +index 29896853a90..9e93585f94e 100755 --- a/ld/configure +++ b/ld/configure @@ -700,8 +700,11 @@ OTOOL @@ -15762,18 +15761,150 @@ index 6406a42c442..21ab5b06709 100755 file_list_spec=$lt_file_list_spec_CXX diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in -index 0a61880ba67..5889b0477cd 100644 +index 0a61880ba67..500756cd023 100644 --- a/libbacktrace/Makefile.in +++ b/libbacktrace/Makefile.in -@@ -827,6 +827,7 @@ CPP = @CPP@ +@@ -1,7 +1,7 @@ +-# Makefile.in generated by automake 1.15.1 from Makefile.am. ++# Makefile.in generated by automake 1.16.5 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994-2017 Free Software Foundation, Inc. ++# Copyright (C) 1994-2021 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -189,6 +189,35 @@ CONFIG_HEADER = config.h + CONFIG_CLEAN_FILES = backtrace-supported.h \ + install-debuginfo-for-buildid.sh + CONFIG_CLEAN_VPATH_FILES = ++@NATIVE_TRUE@am__EXEEXT_1 = allocfail$(EXEEXT) ++@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_2 = b2test$(EXEEXT) ++@HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_3 = b3test$(EXEEXT) ++@NATIVE_TRUE@am__EXEEXT_4 = test_elf_32$(EXEEXT) test_elf_64$(EXEEXT) \ ++@NATIVE_TRUE@ test_macho$(EXEEXT) test_xcoff_32$(EXEEXT) \ ++@NATIVE_TRUE@ test_xcoff_64$(EXEEXT) test_pecoff$(EXEEXT) \ ++@NATIVE_TRUE@ test_unknown$(EXEEXT) unittest$(EXEEXT) \ ++@NATIVE_TRUE@ unittest_alloc$(EXEEXT) btest$(EXEEXT) ++@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_5 = btest_lto$(EXEEXT) ++@NATIVE_TRUE@am__EXEEXT_6 = btest_alloc$(EXEEXT) stest$(EXEEXT) \ ++@NATIVE_TRUE@ stest_alloc$(EXEEXT) ++@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_7 = ztest$(EXEEXT) \ ++@HAVE_ELF_TRUE@@NATIVE_TRUE@ ztest_alloc$(EXEEXT) ++@NATIVE_TRUE@am__EXEEXT_8 = edtest$(EXEEXT) edtest_alloc$(EXEEXT) ++@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__EXEEXT_9 = ttest$(EXEEXT) \ ++@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@ ttest_alloc$(EXEEXT) ++@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__EXEEXT_10 = \ ++@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctestg$(EXEEXT) \ ++@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctesta$(EXEEXT) \ ++@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctestg_alloc$(EXEEXT) \ ++@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctesta_alloc$(EXEEXT) ++@HAVE_DWARF5_TRUE@@NATIVE_TRUE@am__EXEEXT_11 = dwarf5$(EXEEXT) \ ++@HAVE_DWARF5_TRUE@@NATIVE_TRUE@ dwarf5_alloc$(EXEEXT) ++@NATIVE_TRUE@am__EXEEXT_12 = mtest$(EXEEXT) ++@HAVE_ELF_TRUE@am__EXEEXT_13 = xztest$(EXEEXT) xztest_alloc$(EXEEXT) ++am__EXEEXT_14 = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \ ++ $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \ ++ $(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \ ++ $(am__EXEEXT_13) + LTLIBRARIES = $(noinst_LTLIBRARIES) + am__DEPENDENCIES_1 = + am_libbacktrace_la_OBJECTS = atomic.lo dwarf.lo fileline.lo posix.lo \ +@@ -220,35 +249,6 @@ libbacktrace_instrumented_alloc_la_OBJECTS = \ + libbacktrace_noformat_la_OBJECTS = \ + $(am_libbacktrace_noformat_la_OBJECTS) + @NATIVE_TRUE@am_libbacktrace_noformat_la_rpath = +-@NATIVE_TRUE@am__EXEEXT_1 = allocfail$(EXEEXT) +-@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_2 = b2test$(EXEEXT) +-@HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_3 = b3test$(EXEEXT) +-@NATIVE_TRUE@am__EXEEXT_4 = test_elf_32$(EXEEXT) test_elf_64$(EXEEXT) \ +-@NATIVE_TRUE@ test_macho$(EXEEXT) test_xcoff_32$(EXEEXT) \ +-@NATIVE_TRUE@ test_xcoff_64$(EXEEXT) test_pecoff$(EXEEXT) \ +-@NATIVE_TRUE@ test_unknown$(EXEEXT) unittest$(EXEEXT) \ +-@NATIVE_TRUE@ unittest_alloc$(EXEEXT) btest$(EXEEXT) +-@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_5 = btest_lto$(EXEEXT) +-@NATIVE_TRUE@am__EXEEXT_6 = btest_alloc$(EXEEXT) stest$(EXEEXT) \ +-@NATIVE_TRUE@ stest_alloc$(EXEEXT) +-@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_7 = ztest$(EXEEXT) \ +-@HAVE_ELF_TRUE@@NATIVE_TRUE@ ztest_alloc$(EXEEXT) +-@NATIVE_TRUE@am__EXEEXT_8 = edtest$(EXEEXT) edtest_alloc$(EXEEXT) +-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__EXEEXT_9 = ttest$(EXEEXT) \ +-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@ ttest_alloc$(EXEEXT) +-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__EXEEXT_10 = \ +-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctestg$(EXEEXT) \ +-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctesta$(EXEEXT) \ +-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctestg_alloc$(EXEEXT) \ +-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctesta_alloc$(EXEEXT) +-@HAVE_DWARF5_TRUE@@NATIVE_TRUE@am__EXEEXT_11 = dwarf5$(EXEEXT) \ +-@HAVE_DWARF5_TRUE@@NATIVE_TRUE@ dwarf5_alloc$(EXEEXT) +-@NATIVE_TRUE@am__EXEEXT_12 = mtest$(EXEEXT) +-@HAVE_ELF_TRUE@am__EXEEXT_13 = xztest$(EXEEXT) xztest_alloc$(EXEEXT) +-am__EXEEXT_14 = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \ +- $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \ +- $(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \ +- $(am__EXEEXT_13) + @NATIVE_TRUE@am_allocfail_OBJECTS = allocfail-allocfail.$(OBJEXT) \ + @NATIVE_TRUE@ allocfail-testlib.$(OBJEXT) + allocfail_OBJECTS = $(am_allocfail_OBJECTS) +@@ -536,7 +536,7 @@ am__v_at_0 = @ + am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ + depcomp = +-am__depfiles_maybe = ++am__maybe_remake_depfiles = + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +@@ -579,8 +579,8 @@ am__can_run_installinfo = \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ +- $(LISP)config.h.in ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ ++ config.h.in + # Read a list of newline-separated strings from the standard input, + # and print each of them once, without duplicates. Input order is + # *not* preserved. +@@ -597,9 +597,6 @@ am__define_uniq_tagged_files = \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +-ETAGS = etags +-CTAGS = ctags +-CSCOPE = cscope + AM_RECURSIVE_TARGETS = cscope check recheck + am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ +@@ -783,6 +780,7 @@ am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` ++AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' + RECHECK_LOGS = $(TEST_LOGS) + TEST_SUITE_LOG = test-suite.log + TEST_EXTENSIONS = @EXEEXT@ .test +@@ -825,8 +823,11 @@ CLOCK_GETTIME_LINK = @CLOCK_GETTIME_LINK@ + COMM = @COMM@ + CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ++CSCOPE = @CSCOPE@ ++CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DWZ = @DWZ@ -@@ -854,6 +855,7 @@ LN_S = @LN_S@ +@@ -834,6 +835,7 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ETAGS = @ETAGS@ + EXEEXT = @EXEEXT@ + EXTRA_FLAGS = @EXTRA_FLAGS@ + FGREP = @FGREP@ +@@ -854,6 +856,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ @@ -15781,7 +15912,7 @@ index 0a61880ba67..5889b0477cd 100644 MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ -@@ -886,6 +888,7 @@ abs_builddir = @abs_builddir@ +@@ -886,6 +889,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ @@ -15789,8 +15920,331 @@ index 0a61880ba67..5889b0477cd 100644 ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__leading_dot = @am__leading_dot@ +@@ -1178,8 +1182,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ + esac; + $(top_srcdir)/../multilib.am $(am__empty): + +@@ -1211,6 +1215,15 @@ backtrace-supported.h: $(top_builddir)/config.status $(srcdir)/backtrace-support + install-debuginfo-for-buildid.sh: $(top_builddir)/config.status $(srcdir)/install-debuginfo-for-buildid.sh.in + cd $(top_builddir) && $(SHELL) ./config.status $@ + ++clean-checkPROGRAMS: ++ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list ++ + clean-checkLTLIBRARIES: + -test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES) + @list='$(check_LTLIBRARIES)'; \ +@@ -1248,15 +1261,6 @@ libbacktrace_instrumented_alloc.la: $(libbacktrace_instrumented_alloc_la_OBJECTS + libbacktrace_noformat.la: $(libbacktrace_noformat_la_OBJECTS) $(libbacktrace_noformat_la_DEPENDENCIES) $(EXTRA_libbacktrace_noformat_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(am_libbacktrace_noformat_la_rpath) $(libbacktrace_noformat_la_OBJECTS) $(libbacktrace_noformat_la_LIBADD) $(LIBS) + +-clean-checkPROGRAMS: +- @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ +- echo " rm -f" $$list; \ +- rm -f $$list || exit $$?; \ +- test -n "$(EXEEXT)" || exit 0; \ +- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f" $$list; \ +- rm -f $$list +- + allocfail$(EXEEXT): $(allocfail_OBJECTS) $(allocfail_DEPENDENCIES) $(EXTRA_allocfail_DEPENDENCIES) + @rm -f allocfail$(EXEEXT) + $(AM_V_CCLD)$(allocfail_LINK) $(allocfail_OBJECTS) $(allocfail_LDADD) $(LIBS) +@@ -1959,7 +1963,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ +- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ ++ echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ +@@ -1972,7 +1976,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) + fi; \ + $$success || exit 1 + +-check-TESTS: ++check-TESTS: $(check_PROGRAMS) $(check_LTLIBRARIES) $(check_DATA) + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) +@@ -1982,7 +1986,7 @@ check-TESTS: + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +-recheck: all $(check_LTLIBRARIES) $(check_PROGRAMS) $(check_DATA) ++recheck: all $(check_PROGRAMS) $(check_LTLIBRARIES) $(check_DATA) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ +@@ -2260,7 +2264,7 @@ xztest_alloc.log: xztest_alloc$(EXEEXT) + @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + check-am: all-am +- $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS) \ ++ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_LTLIBRARIES) \ + $(check_DATA) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS + check: check-am +diff --git a/libbacktrace/aclocal.m4 b/libbacktrace/aclocal.m4 +index 528e6173930..d88a5ec84f2 100644 +--- a/libbacktrace/aclocal.m4 ++++ b/libbacktrace/aclocal.m4 +@@ -1,6 +1,6 @@ +-# generated automatically by aclocal 1.15.1 -*- Autoconf -*- ++# generated automatically by aclocal 1.16.5 -*- Autoconf -*- + +-# Copyright (C) 1996-2017 Free Software Foundation, Inc. ++# Copyright (C) 1996-2021 Free Software Foundation, Inc. + + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically 'autoreconf'.])]) + +-# Copyright (C) 2002-2017 Free Software Foundation, Inc. ++# Copyright (C) 2002-2021 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) + # generated from the m4 files accompanying Automake X.Y. + # (This private macro should not be called outside this file.) + AC_DEFUN([AM_AUTOMAKE_VERSION], +-[am__api_version='1.15' ++[am__api_version='1.16' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.15.1], [], ++m4_if([$1], [1.16.5], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.15.1])dnl ++[AM_AUTOMAKE_VERSION([1.16.5])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + +-# Copyright (C) 2001-2017 Free Software Foundation, Inc. ++# Copyright (C) 2001-2021 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` + + # AM_CONDITIONAL -*- Autoconf -*- + +-# Copyright (C) 1997-2017 Free Software Foundation, Inc. ++# Copyright (C) 1997-2021 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -143,7 +143,7 @@ fi])]) + + # Do all the work for Automake. -*- Autoconf -*- + +-# Copyright (C) 1996-2017 Free Software Foundation, Inc. ++# Copyright (C) 1996-2021 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -171,6 +171,10 @@ m4_defn([AC_PROG_CC]) + # release and drop the old call support. + AC_DEFUN([AM_INIT_AUTOMAKE], + [AC_PREREQ([2.65])dnl ++m4_ifdef([_$0_ALREADY_INIT], ++ [m4_fatal([$0 expanded multiple times ++]m4_defn([_$0_ALREADY_INIT]))], ++ [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl + dnl Autoconf wants to disallow AM_ names. We explicitly allow + dnl the ones we care about. + m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +@@ -207,7 +211,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + [_AM_SET_OPTIONS([$1])dnl + dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. + m4_if( +- m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), ++ m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +@@ -230,8 +234,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl + AC_REQUIRE([AC_PROG_MKDIR_P])dnl + # For better backward compatibility. To be removed once Automake 1.9.x + # dies out for good. For more background, see: +-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> +-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> ++# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> ++# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> + AC_SUBST([mkdir_p], ['$(MKDIR_P)']) + # We need awk for the "check" target (and possibly the TAP driver). The + # system "awk" is bad on some platforms. +@@ -259,6 +263,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl + ]) ++# Variables for tags utilities; see am/tags.am ++if test -z "$CTAGS"; then ++ CTAGS=ctags ++fi ++AC_SUBST([CTAGS]) ++if test -z "$ETAGS"; then ++ ETAGS=etags ++fi ++AC_SUBST([ETAGS]) ++if test -z "$CSCOPE"; then ++ CSCOPE=cscope ++fi ++AC_SUBST([CSCOPE]) ++ + AC_REQUIRE([AM_SILENT_RULES])dnl + dnl The testsuite driver may need to know about EXEEXT, so add the + dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +@@ -298,7 +316,7 @@ END + Aborting the configuration process, to ensure you take notice of the issue. + + You can download and install GNU coreutils to get an 'rm' implementation +-that behaves properly: <http://www.gnu.org/software/coreutils/>. ++that behaves properly: <https://www.gnu.org/software/coreutils/>. + + If you want to complete the configuration process using your problematic + 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +@@ -340,7 +358,7 @@ for _am_header in $config_headers :; do + done + echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +-# Copyright (C) 2001-2017 Free Software Foundation, Inc. ++# Copyright (C) 2001-2021 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -364,7 +382,7 @@ AC_SUBST([install_sh])]) + # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- + # From Jim Meyering + +-# Copyright (C) 1996-2017 Free Software Foundation, Inc. ++# Copyright (C) 1996-2021 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -399,7 +417,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +-# Copyright (C) 1997-2017 Free Software Foundation, Inc. ++# Copyright (C) 1997-2021 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -420,12 +438,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl + AC_REQUIRE_AUX_FILE([missing])dnl + if test x"${MISSING+set}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; +- *) +- MISSING="\${SHELL} $am_aux_dir/missing" ;; +- esac ++ MISSING="\${SHELL} '$am_aux_dir/missing'" + fi + # Use eval to expand $SHELL + if eval "$MISSING --is-lightweight"; then +@@ -438,7 +451,7 @@ fi + + # Helper functions for option handling. -*- Autoconf -*- + +-# Copyright (C) 2001-2017 Free Software Foundation, Inc. ++# Copyright (C) 2001-2021 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -467,7 +480,7 @@ AC_DEFUN([_AM_SET_OPTIONS], + AC_DEFUN([_AM_IF_OPTION], + [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +-# Copyright (C) 1999-2017 Free Software Foundation, Inc. ++# Copyright (C) 1999-2021 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -514,7 +527,7 @@ AC_LANG_POP([C])]) + # For backward compatibility. + AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +-# Copyright (C) 2001-2017 Free Software Foundation, Inc. ++# Copyright (C) 2001-2021 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -533,7 +546,7 @@ AC_DEFUN([AM_RUN_LOG], + + # Check to make sure that the build environment is sane. -*- Autoconf -*- + +-# Copyright (C) 1996-2017 Free Software Foundation, Inc. ++# Copyright (C) 1996-2021 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -614,7 +627,7 @@ AC_CONFIG_COMMANDS_PRE( + rm -f conftest.file + ]) + +-# Copyright (C) 2009-2017 Free Software Foundation, Inc. ++# Copyright (C) 2009-2021 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -674,7 +687,7 @@ AC_SUBST([AM_BACKSLASH])dnl + _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl + ]) + +-# Copyright (C) 2001-2017 Free Software Foundation, Inc. ++# Copyright (C) 2001-2021 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -702,7 +715,7 @@ fi + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +-# Copyright (C) 2006-2017 Free Software Foundation, Inc. ++# Copyright (C) 2006-2021 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -721,7 +734,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + + # Check how to create a tarball. -*- Autoconf -*- + +-# Copyright (C) 2004-2017 Free Software Foundation, Inc. ++# Copyright (C) 2004-2021 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, diff --git a/libbacktrace/configure b/libbacktrace/configure -index 406b67b8cbc..b648da40aab 100755 +index 406b67b8cbc..51f0a264cb7 100755 --- a/libbacktrace/configure +++ b/libbacktrace/configure @@ -680,7 +680,10 @@ OTOOL @@ -15804,7 +16258,17 @@ index 406b67b8cbc..b648da40aab 100755 OBJDUMP LN_S NM -@@ -798,6 +801,7 @@ enable_static +@@ -701,6 +704,9 @@ AM_BACKSLASH + AM_DEFAULT_VERBOSITY + AM_DEFAULT_V + AM_V ++CSCOPE ++ETAGS ++CTAGS + am__untar + am__tar + AMTAR +@@ -798,6 +804,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -15812,7 +16276,7 @@ index 406b67b8cbc..b648da40aab 100755 enable_libtool_lock enable_largefile enable_cet -@@ -1458,6 +1462,8 @@ Optional Packages: +@@ -1458,6 +1465,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -15821,7 +16285,71 @@ index 406b67b8cbc..b648da40aab 100755 --with-system-libunwind use installed libunwind Some influential environment variables: -@@ -5446,8 +5452,8 @@ esac +@@ -4047,7 +4056,7 @@ libtool_VERSION=1:0:0 + # -Wall: Issue all automake warnings. + # -Wno-portability: Don't warn about constructs supported by GNU make. + # (because GCC requires GNU make anyhow). +-am__api_version='1.15' ++am__api_version='1.16' + + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or +@@ -4220,12 +4229,7 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' + program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + + if test x"${MISSING+set}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; +- *) +- MISSING="\${SHELL} $am_aux_dir/missing" ;; +- esac ++ MISSING="\${SHELL} '$am_aux_dir/missing'" + fi + # Use eval to expand $SHELL + if eval "$MISSING --is-lightweight"; then +@@ -4551,8 +4555,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + + # For better backward compatibility. To be removed once Automake 1.9.x + # dies out for good. For more background, see: +-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> +-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> ++# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> ++# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> + mkdir_p='$(MKDIR_P)' + + # We need awk for the "check" target (and possibly the TAP driver). The +@@ -4571,6 +4575,20 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + ++# Variables for tags utilities; see am/tags.am ++if test -z "$CTAGS"; then ++ CTAGS=ctags ++fi ++ ++if test -z "$ETAGS"; then ++ ETAGS=etags ++fi ++ ++if test -z "$CSCOPE"; then ++ CSCOPE=cscope ++fi ++ ++ + + # POSIX will say in a future version that running "rm -f" with no argument + # is OK; and we want to be able to make that assumption in our Makefile +@@ -4603,7 +4621,7 @@ END + Aborting the configuration process, to ensure you take notice of the issue. + + You can download and install GNU coreutils to get an 'rm' implementation +-that behaves properly: <http://www.gnu.org/software/coreutils/>. ++that behaves properly: <https://www.gnu.org/software/coreutils/>. + + If you want to complete the configuration process using your problematic + 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +@@ -5446,8 +5464,8 @@ esac @@ -15832,7 +16360,7 @@ index 406b67b8cbc..b648da40aab 100755 -@@ -5487,7 +5493,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5487,7 +5505,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -15841,7 +16369,7 @@ index 406b67b8cbc..b648da40aab 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6180,8 +6186,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6180,8 +6198,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -15852,7 +16380,7 @@ index 406b67b8cbc..b648da40aab 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6230,6 +6236,80 @@ esac +@@ -6230,6 +6248,80 @@ esac @@ -15933,7 +16461,7 @@ index 406b67b8cbc..b648da40aab 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6246,6 +6326,11 @@ case $reload_flag in +@@ -6246,6 +6338,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -15945,7 +16473,7 @@ index 406b67b8cbc..b648da40aab 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6414,7 +6499,8 @@ mingw* | pw32*) +@@ -6414,7 +6511,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -15955,7 +16483,7 @@ index 406b67b8cbc..b648da40aab 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6568,6 +6654,21 @@ esac +@@ -6568,6 +6666,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -15977,7 +16505,7 @@ index 406b67b8cbc..b648da40aab 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6583,6 +6684,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6583,6 +6696,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -16135,7 +16663,7 @@ index 406b67b8cbc..b648da40aab 100755 plugin_option= plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" for plugin in $plugin_names; do -@@ -6597,8 +6849,10 @@ for plugin in $plugin_names; do +@@ -6597,8 +6861,10 @@ for plugin in $plugin_names; do done if test -n "$ac_tool_prefix"; then @@ -16148,7 +16676,7 @@ index 406b67b8cbc..b648da40aab 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6614,7 +6868,7 @@ do +@@ -6614,7 +6880,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -16157,7 +16685,7 @@ index 406b67b8cbc..b648da40aab 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6634,11 +6888,15 @@ $as_echo "no" >&6; } +@@ -6634,11 +6900,15 @@ $as_echo "no" >&6; } fi @@ -16176,7 +16704,7 @@ index 406b67b8cbc..b648da40aab 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6654,7 +6912,7 @@ do +@@ -6654,7 +6924,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -16185,7 +16713,7 @@ index 406b67b8cbc..b648da40aab 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6673,6 +6931,10 @@ else +@@ -6673,6 +6943,10 @@ else $as_echo "no" >&6; } fi @@ -16196,7 +16724,7 @@ index 406b67b8cbc..b648da40aab 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6684,25 +6946,19 @@ ac_tool_warned=yes ;; +@@ -6684,31 +6958,83 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -16228,10 +16756,14 @@ index 406b67b8cbc..b648da40aab 100755 + rm -f conftest.* +: ${AR=ar} +: ${AR_FLAGS=cru} ++ ++ ++ ++ ++ -@@ -6714,6 +6970,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -16288,15 +16820,10 @@ index 406b67b8cbc..b648da40aab 100755 +fi + + -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -7053,8 +7367,8 @@ esac + + + +@@ -7053,8 +7379,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -16307,7 +16834,7 @@ index 406b67b8cbc..b648da40aab 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -7090,6 +7404,7 @@ for ac_symprfx in "" "_"; do +@@ -7090,6 +7416,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -16315,7 +16842,7 @@ index 406b67b8cbc..b648da40aab 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7131,6 +7446,18 @@ _LT_EOF +@@ -7131,6 +7458,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -16334,7 +16861,7 @@ index 406b67b8cbc..b648da40aab 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7142,7 +7469,7 @@ _LT_EOF +@@ -7142,7 +7481,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -16343,7 +16870,7 @@ index 406b67b8cbc..b648da40aab 100755 const char *name; void *address; } -@@ -7168,8 +7495,8 @@ static const void *lt_preloaded_setup() { +@@ -7168,8 +7507,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -16354,7 +16881,7 @@ index 406b67b8cbc..b648da40aab 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7179,8 +7506,8 @@ _LT_EOF +@@ -7179,8 +7518,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -16365,7 +16892,7 @@ index 406b67b8cbc..b648da40aab 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7217,6 +7544,18 @@ else +@@ -7217,6 +7556,18 @@ else $as_echo "ok" >&6; } fi @@ -16384,7 +16911,7 @@ index 406b67b8cbc..b648da40aab 100755 -@@ -7233,6 +7572,43 @@ fi +@@ -7233,6 +7584,43 @@ fi @@ -16428,10 +16955,56 @@ index 406b67b8cbc..b648da40aab 100755 -@@ -7444,6 +7820,123 @@ esac - - need_locks="$enable_libtool_lock" - +@@ -7399,50 +7787,167 @@ _ACEOF + if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes + else +- lt_cv_cc_needs_belf=no ++ lt_cv_cc_needs_belf=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 ++$as_echo "$lt_cv_cc_needs_belf" >&6; } ++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++ CFLAGS="$SAVE_CFLAGS" ++ fi ++ ;; ++sparc*-*solaris*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ case `/usr/bin/file conftest.o` in ++ *64-bit*) ++ case $lt_cv_prog_gnu_ld in ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++esac ++ ++need_locks="$enable_libtool_lock" ++ +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 @@ -16507,8 +17080,21 @@ index 406b67b8cbc..b648da40aab 100755 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } -+fi -+ + fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu + +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +-$as_echo "$lt_cv_cc_needs_belf" >&6; } +- if test x"$lt_cv_cc_needs_belf" != x"yes"; then +- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +- CFLAGS="$SAVE_CFLAGS" + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" + else @@ -16519,7 +17105,28 @@ index 406b67b8cbc..b648da40aab 100755 +ac_tool_warned=yes ;; +esac + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi + fi +- ;; +-sparc*-*solaris*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- case `/usr/bin/file conftest.o` in +- *64-bit*) +- case $lt_cv_prog_gnu_ld in +- yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) +- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then +- LD="${LD-ld} -64" +- fi +- ;; +- esac +- ;; +- esac +else + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" +fi @@ -16536,7 +17143,10 @@ index 406b67b8cbc..b648da40aab 100755 + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes -+ fi + fi +- rm -rf conftest* +- ;; +-esac + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 @@ -16547,12 +17157,12 @@ index 406b67b8cbc..b648da40aab 100755 + + + -+ -+ + +-need_locks="$enable_libtool_lock" + case $host_os in - rhapsody* | darwin*) -@@ -8007,6 +8500,8 @@ _LT_EOF +@@ -8007,6 +8512,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -16561,7 +17171,7 @@ index 406b67b8cbc..b648da40aab 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8589,8 +9084,6 @@ fi +@@ -8589,8 +9096,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -16570,7 +17180,7 @@ index 406b67b8cbc..b648da40aab 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8756,6 +9249,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8756,6 +9261,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -16583,7 +17193,7 @@ index 406b67b8cbc..b648da40aab 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8818,7 +9317,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8818,7 +9329,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -16592,7 +17202,7 @@ index 406b67b8cbc..b648da40aab 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8875,13 +9374,17 @@ case $host_os in +@@ -8875,13 +9386,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -16616,7 +17226,7 @@ index 406b67b8cbc..b648da40aab 100755 # # Check to make sure the PIC flag actually works. -@@ -8942,6 +9445,11 @@ fi +@@ -8942,6 +9457,11 @@ fi @@ -16628,7 +17238,7 @@ index 406b67b8cbc..b648da40aab 100755 # # Check to make sure the static flag actually works. # -@@ -9292,7 +9800,8 @@ _LT_EOF +@@ -9292,7 +9812,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -16638,7 +17248,7 @@ index 406b67b8cbc..b648da40aab 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9391,12 +9900,12 @@ _LT_EOF +@@ -9391,12 +9912,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -16653,7 +17263,7 @@ index 406b67b8cbc..b648da40aab 100755 fi ;; esac -@@ -9410,8 +9919,8 @@ _LT_EOF +@@ -9410,8 +9931,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -16664,7 +17274,7 @@ index 406b67b8cbc..b648da40aab 100755 fi ;; -@@ -9429,8 +9938,8 @@ _LT_EOF +@@ -9429,8 +9950,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -16675,7 +17285,7 @@ index 406b67b8cbc..b648da40aab 100755 else ld_shlibs=no fi -@@ -9476,8 +9985,8 @@ _LT_EOF +@@ -9476,8 +9997,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -16686,7 +17296,7 @@ index 406b67b8cbc..b648da40aab 100755 else ld_shlibs=no fi -@@ -9607,7 +10116,13 @@ _LT_EOF +@@ -9607,7 +10128,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -16701,7 +17311,7 @@ index 406b67b8cbc..b648da40aab 100755 /* end confdefs.h. */ int -@@ -9620,22 +10135,29 @@ main () +@@ -9620,22 +10147,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -16744,7 +17354,7 @@ index 406b67b8cbc..b648da40aab 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9647,7 +10169,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9647,7 +10181,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -16759,7 +17369,7 @@ index 406b67b8cbc..b648da40aab 100755 /* end confdefs.h. */ int -@@ -9660,22 +10188,29 @@ main () +@@ -9660,22 +10200,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -16802,7 +17412,7 @@ index 406b67b8cbc..b648da40aab 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9720,20 +10255,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9720,20 +10267,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -16880,7 +17490,7 @@ index 406b67b8cbc..b648da40aab 100755 ;; darwin* | rhapsody*) -@@ -9794,7 +10372,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9794,7 +10384,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -16889,7 +17499,7 @@ index 406b67b8cbc..b648da40aab 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9802,7 +10380,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9802,7 +10392,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -16898,7 +17508,7 @@ index 406b67b8cbc..b648da40aab 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9818,7 +10396,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9818,7 +10408,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -16907,7 +17517,7 @@ index 406b67b8cbc..b648da40aab 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9842,10 +10420,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9842,10 +10432,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -16920,7 +17530,7 @@ index 406b67b8cbc..b648da40aab 100755 ;; esac else -@@ -9924,23 +10502,36 @@ fi +@@ -9924,23 +10514,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -16965,7 +17575,7 @@ index 406b67b8cbc..b648da40aab 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10025,7 +10616,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10025,7 +10628,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -16974,7 +17584,7 @@ index 406b67b8cbc..b648da40aab 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10044,9 +10635,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10044,9 +10647,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -16986,7 +17596,7 @@ index 406b67b8cbc..b648da40aab 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10622,8 +11213,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10622,8 +11225,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -16998,7 +17608,7 @@ index 406b67b8cbc..b648da40aab 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10656,13 +11248,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10656,13 +11260,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -17071,7 +17681,7 @@ index 406b67b8cbc..b648da40aab 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -11540,7 +12190,7 @@ else +@@ -11540,7 +12202,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF @@ -17080,7 +17690,7 @@ index 406b67b8cbc..b648da40aab 100755 #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11584,10 +12234,10 @@ else +@@ -11584,10 +12246,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -17093,7 +17703,7 @@ index 406b67b8cbc..b648da40aab 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11646,7 +12296,7 @@ else +@@ -11646,7 +12308,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF @@ -17102,7 +17712,7 @@ index 406b67b8cbc..b648da40aab 100755 #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11690,10 +12340,10 @@ else +@@ -11690,10 +12352,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -17115,7 +17725,7 @@ index 406b67b8cbc..b648da40aab 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -14979,13 +15629,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -14979,13 +15641,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -17136,7 +17746,7 @@ index 406b67b8cbc..b648da40aab 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15000,14 +15657,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -15000,14 +15669,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -17155,7 +17765,7 @@ index 406b67b8cbc..b648da40aab 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15040,12 +15700,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -15040,12 +15712,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -17169,7 +17779,7 @@ index 406b67b8cbc..b648da40aab 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -15100,8 +15760,13 @@ reload_flag \ +@@ -15100,8 +15772,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -17183,7 +17793,7 @@ index 406b67b8cbc..b648da40aab 100755 STRIP \ RANLIB \ CC \ -@@ -15111,12 +15776,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -15111,12 +15788,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -17199,7 +17809,7 @@ index 406b67b8cbc..b648da40aab 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -15132,7 +15799,6 @@ no_undefined_flag \ +@@ -15132,7 +15811,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -17207,7 +17817,7 @@ index 406b67b8cbc..b648da40aab 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -15168,6 +15834,7 @@ module_cmds \ +@@ -15168,6 +15846,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -17215,7 +17825,7 @@ index 406b67b8cbc..b648da40aab 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -15866,7 +16533,8 @@ esac ;; +@@ -15866,7 +16545,8 @@ esac ;; # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -17225,7 +17835,7 @@ index 406b67b8cbc..b648da40aab 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -15969,19 +16637,42 @@ SP2NL=$lt_lt_SP2NL +@@ -15969,19 +16649,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -17269,7 +17879,7 @@ index 406b67b8cbc..b648da40aab 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -16011,6 +16702,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -16011,6 +16714,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -17282,7 +17892,7 @@ index 406b67b8cbc..b648da40aab 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -16020,6 +16717,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -16020,6 +16729,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -17292,7 +17902,7 @@ index 406b67b8cbc..b648da40aab 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -16134,12 +16834,12 @@ with_gcc=$GCC +@@ -16134,12 +16846,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -17308,7 +17918,7 @@ index 406b67b8cbc..b648da40aab 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -16226,9 +16926,6 @@ inherit_rpath=$inherit_rpath +@@ -16226,9 +16938,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -17318,7 +17928,7 @@ index 406b67b8cbc..b648da40aab 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -16244,6 +16941,9 @@ include_expsyms=$lt_include_expsyms +@@ -16244,6 +16953,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -17328,7 +17938,7 @@ index 406b67b8cbc..b648da40aab 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -16276,210 +16976,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -16276,210 +16988,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -17703,10 +18313,10 @@ index 406b67b8cbc..b648da40aab 100755 chmod +x "$ofile" diff --git a/libctf/Makefile.in b/libctf/Makefile.in -index f2b852e3fae..63e3b2e05ea 100644 +index 3d2696bcc47..3bad01c3c9b 100644 --- a/libctf/Makefile.in +++ b/libctf/Makefile.in -@@ -393,6 +393,7 @@ CYGPATH_W = @CYGPATH_W@ +@@ -392,6 +392,7 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -17723,10 +18333,10 @@ index f2b852e3fae..63e3b2e05ea 100644 NM = @NM@ NMEDIT = @NMEDIT@ diff --git a/libctf/configure b/libctf/configure -index b347b292195..d6d6e341887 100755 +index a0e40f49a80..42bc002c2b9 100755 --- a/libctf/configure +++ b/libctf/configure -@@ -669,6 +669,8 @@ OTOOL +@@ -668,6 +668,8 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -17735,7 +18345,7 @@ index b347b292195..d6d6e341887 100755 OBJDUMP LN_S NM -@@ -800,6 +802,7 @@ enable_static +@@ -799,6 +801,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -17743,7 +18353,7 @@ index b347b292195..d6d6e341887 100755 enable_libtool_lock enable_largefile enable_werror_always -@@ -1463,6 +1466,8 @@ Optional Packages: +@@ -1462,6 +1465,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -17752,7 +18362,7 @@ index b347b292195..d6d6e341887 100755 --with-system-zlib use installed libz Some influential environment variables: -@@ -5568,8 +5573,8 @@ esac +@@ -5567,8 +5572,8 @@ esac @@ -17763,7 +18373,7 @@ index b347b292195..d6d6e341887 100755 -@@ -5609,7 +5614,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5608,7 +5613,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -17772,7 +18382,7 @@ index b347b292195..d6d6e341887 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6302,8 +6307,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6301,8 +6306,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -17783,7 +18393,7 @@ index b347b292195..d6d6e341887 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6352,6 +6357,80 @@ esac +@@ -6351,6 +6356,80 @@ esac @@ -17864,7 +18474,7 @@ index b347b292195..d6d6e341887 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6368,6 +6447,11 @@ case $reload_flag in +@@ -6367,6 +6446,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -17876,7 +18486,7 @@ index b347b292195..d6d6e341887 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6536,7 +6620,8 @@ mingw* | pw32*) +@@ -6535,7 +6619,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -17886,7 +18496,7 @@ index b347b292195..d6d6e341887 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6690,6 +6775,21 @@ esac +@@ -6689,6 +6774,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -17908,7 +18518,7 @@ index b347b292195..d6d6e341887 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6705,6 +6805,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6704,6 +6804,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -18066,7 +18676,7 @@ index b347b292195..d6d6e341887 100755 plugin_option= plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" for plugin in $plugin_names; do -@@ -6719,8 +6970,10 @@ for plugin in $plugin_names; do +@@ -6718,8 +6969,10 @@ for plugin in $plugin_names; do done if test -n "$ac_tool_prefix"; then @@ -18079,7 +18689,7 @@ index b347b292195..d6d6e341887 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6736,7 +6989,7 @@ do +@@ -6735,7 +6988,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -18088,7 +18698,7 @@ index b347b292195..d6d6e341887 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6756,11 +7009,15 @@ $as_echo "no" >&6; } +@@ -6755,11 +7008,15 @@ $as_echo "no" >&6; } fi @@ -18107,7 +18717,7 @@ index b347b292195..d6d6e341887 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6776,7 +7033,7 @@ do +@@ -6775,7 +7032,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -18116,7 +18726,7 @@ index b347b292195..d6d6e341887 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6795,6 +7052,10 @@ else +@@ -6794,6 +7051,10 @@ else $as_echo "no" >&6; } fi @@ -18127,7 +18737,7 @@ index b347b292195..d6d6e341887 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6806,25 +7067,19 @@ ac_tool_warned=yes ;; +@@ -6805,25 +7066,19 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -18162,7 +18772,7 @@ index b347b292195..d6d6e341887 100755 -@@ -6836,6 +7091,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -6835,6 +7090,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -18227,7 +18837,7 @@ index b347b292195..d6d6e341887 100755 if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -7175,8 +7488,8 @@ esac +@@ -7174,8 +7487,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -18238,7 +18848,7 @@ index b347b292195..d6d6e341887 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -7212,6 +7525,7 @@ for ac_symprfx in "" "_"; do +@@ -7211,6 +7524,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -18246,7 +18856,7 @@ index b347b292195..d6d6e341887 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7253,6 +7567,18 @@ _LT_EOF +@@ -7252,6 +7566,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -18265,7 +18875,7 @@ index b347b292195..d6d6e341887 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7264,7 +7590,7 @@ _LT_EOF +@@ -7263,7 +7589,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -18274,7 +18884,7 @@ index b347b292195..d6d6e341887 100755 const char *name; void *address; } -@@ -7290,8 +7616,8 @@ static const void *lt_preloaded_setup() { +@@ -7289,8 +7615,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -18285,7 +18895,7 @@ index b347b292195..d6d6e341887 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7301,8 +7627,8 @@ _LT_EOF +@@ -7300,8 +7626,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -18296,7 +18906,7 @@ index b347b292195..d6d6e341887 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7339,6 +7665,17 @@ else +@@ -7338,6 +7664,17 @@ else $as_echo "ok" >&6; } fi @@ -18314,7 +18924,7 @@ index b347b292195..d6d6e341887 100755 -@@ -7355,6 +7692,44 @@ fi +@@ -7354,6 +7691,44 @@ fi @@ -18359,7 +18969,7 @@ index b347b292195..d6d6e341887 100755 -@@ -7566,6 +7941,123 @@ esac +@@ -7565,6 +7940,123 @@ esac need_locks="$enable_libtool_lock" @@ -18483,7 +19093,7 @@ index b347b292195..d6d6e341887 100755 case $host_os in rhapsody* | darwin*) -@@ -8129,6 +8621,8 @@ _LT_EOF +@@ -8128,6 +8620,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -18492,7 +19102,7 @@ index b347b292195..d6d6e341887 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8681,8 +9175,6 @@ fi +@@ -8680,8 +9174,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -18501,7 +19111,7 @@ index b347b292195..d6d6e341887 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8848,6 +9340,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8847,6 +9339,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -18514,7 +19124,7 @@ index b347b292195..d6d6e341887 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8910,7 +9408,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8909,7 +9407,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -18523,7 +19133,7 @@ index b347b292195..d6d6e341887 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8967,13 +9465,17 @@ case $host_os in +@@ -8966,13 +9464,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -18547,7 +19157,7 @@ index b347b292195..d6d6e341887 100755 # # Check to make sure the PIC flag actually works. -@@ -9034,6 +9536,11 @@ fi +@@ -9033,6 +9535,11 @@ fi @@ -18559,7 +19169,7 @@ index b347b292195..d6d6e341887 100755 # # Check to make sure the static flag actually works. # -@@ -9384,7 +9891,8 @@ _LT_EOF +@@ -9383,7 +9890,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -18569,7 +19179,7 @@ index b347b292195..d6d6e341887 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9483,12 +9991,12 @@ _LT_EOF +@@ -9482,12 +9990,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -18584,7 +19194,7 @@ index b347b292195..d6d6e341887 100755 fi ;; esac -@@ -9502,8 +10010,8 @@ _LT_EOF +@@ -9501,8 +10009,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -18595,7 +19205,7 @@ index b347b292195..d6d6e341887 100755 fi ;; -@@ -9521,8 +10029,8 @@ _LT_EOF +@@ -9520,8 +10028,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -18606,7 +19216,7 @@ index b347b292195..d6d6e341887 100755 else ld_shlibs=no fi -@@ -9568,8 +10076,8 @@ _LT_EOF +@@ -9567,8 +10075,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -18617,7 +19227,7 @@ index b347b292195..d6d6e341887 100755 else ld_shlibs=no fi -@@ -9699,7 +10207,13 @@ _LT_EOF +@@ -9698,7 +10206,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -18632,7 +19242,7 @@ index b347b292195..d6d6e341887 100755 /* end confdefs.h. */ int -@@ -9712,22 +10226,29 @@ main () +@@ -9711,22 +10225,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -18675,7 +19285,7 @@ index b347b292195..d6d6e341887 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9739,7 +10260,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9738,7 +10259,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -18690,7 +19300,7 @@ index b347b292195..d6d6e341887 100755 /* end confdefs.h. */ int -@@ -9752,22 +10279,29 @@ main () +@@ -9751,22 +10278,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -18733,7 +19343,7 @@ index b347b292195..d6d6e341887 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9812,20 +10346,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9811,20 +10345,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -18811,7 +19421,7 @@ index b347b292195..d6d6e341887 100755 ;; darwin* | rhapsody*) -@@ -9886,7 +10463,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9885,7 +10462,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -18820,7 +19430,7 @@ index b347b292195..d6d6e341887 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9894,7 +10471,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9893,7 +10470,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -18829,7 +19439,7 @@ index b347b292195..d6d6e341887 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9910,7 +10487,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9909,7 +10486,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -18838,7 +19448,7 @@ index b347b292195..d6d6e341887 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9934,10 +10511,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9933,10 +10510,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -18851,7 +19461,7 @@ index b347b292195..d6d6e341887 100755 ;; esac else -@@ -10016,23 +10593,36 @@ fi +@@ -10015,23 +10592,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -18896,7 +19506,7 @@ index b347b292195..d6d6e341887 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10117,7 +10707,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10116,7 +10706,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -18905,7 +19515,7 @@ index b347b292195..d6d6e341887 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10136,9 +10726,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10135,9 +10725,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -18917,7 +19527,7 @@ index b347b292195..d6d6e341887 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10714,8 +11304,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10713,8 +11303,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -18929,7 +19539,7 @@ index b347b292195..d6d6e341887 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10748,13 +11339,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10747,13 +11338,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -19002,16 +19612,16 @@ index b347b292195..d6d6e341887 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -11632,7 +12281,7 @@ else +@@ -11631,7 +12280,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11635 "configure" +-#line 11634 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11676,10 +12325,10 @@ else +@@ -11675,10 +12324,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -19024,16 +19634,16 @@ index b347b292195..d6d6e341887 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11738,7 +12387,7 @@ else +@@ -11737,7 +12386,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11741 "configure" +-#line 11740 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11782,10 +12431,10 @@ else +@@ -11781,10 +12430,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -19046,7 +19656,7 @@ index b347b292195..d6d6e341887 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15832,13 +16481,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -15825,13 +16474,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -19067,7 +19677,7 @@ index b347b292195..d6d6e341887 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15853,14 +16509,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -15846,14 +16502,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -19086,7 +19696,7 @@ index b347b292195..d6d6e341887 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15893,12 +16552,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -15886,12 +16545,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -19100,7 +19710,7 @@ index b347b292195..d6d6e341887 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -15953,8 +16612,13 @@ reload_flag \ +@@ -15946,8 +16605,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -19114,7 +19724,7 @@ index b347b292195..d6d6e341887 100755 STRIP \ RANLIB \ CC \ -@@ -15964,12 +16628,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -15957,12 +16621,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -19130,7 +19740,7 @@ index b347b292195..d6d6e341887 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -15985,7 +16651,6 @@ no_undefined_flag \ +@@ -15978,7 +16644,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -19138,7 +19748,7 @@ index b347b292195..d6d6e341887 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -16021,6 +16686,7 @@ module_cmds \ +@@ -16014,6 +16679,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -19146,7 +19756,7 @@ index b347b292195..d6d6e341887 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -16778,7 +17444,8 @@ $as_echo X"$file" | +@@ -16771,7 +17437,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -19156,7 +19766,7 @@ index b347b292195..d6d6e341887 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -16881,19 +17548,42 @@ SP2NL=$lt_lt_SP2NL +@@ -16874,19 +17541,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -19200,7 +19810,7 @@ index b347b292195..d6d6e341887 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -16923,6 +17613,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -16916,6 +17606,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -19213,7 +19823,7 @@ index b347b292195..d6d6e341887 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -16932,6 +17628,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -16925,6 +17621,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -19223,7 +19833,7 @@ index b347b292195..d6d6e341887 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -17046,12 +17745,12 @@ with_gcc=$GCC +@@ -17039,12 +17738,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -19239,7 +19849,7 @@ index b347b292195..d6d6e341887 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -17138,9 +17837,6 @@ inherit_rpath=$inherit_rpath +@@ -17131,9 +17830,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -19249,7 +19859,7 @@ index b347b292195..d6d6e341887 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -17156,6 +17852,9 @@ include_expsyms=$lt_include_expsyms +@@ -17149,6 +17845,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -19259,7 +19869,7 @@ index b347b292195..d6d6e341887 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -17188,210 +17887,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -17181,210 +17880,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -19634,7 +20244,7 @@ index b347b292195..d6d6e341887 100755 chmod +x "$ofile" diff --git a/libsframe/Makefile.in b/libsframe/Makefile.in -index 107b82ccfdc..4a4459bf5eb 100644 +index 08c780caa4a..7ea9c94c2af 100644 --- a/libsframe/Makefile.in +++ b/libsframe/Makefile.in @@ -1,7 +1,7 @@ @@ -19647,25 +20257,31 @@ index 107b82ccfdc..4a4459bf5eb 100644 # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, -@@ -139,6 +139,10 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs +@@ -142,6 +142,13 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +@HAVE_COMPAT_DEJAGNU_TRUE@am__EXEEXT_1 = testsuite/libsframe.decode/be-flipping$(EXEEXT) \ +@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-1$(EXEEXT) \ +@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-2$(EXEEXT) \ -+@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.encode/encode-1$(EXEEXT) ++@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.encode/encode-1$(EXEEXT) \ ++@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.find/findfre-1$(EXEEXT) \ ++@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.find/findfunc-1$(EXEEXT) \ ++@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.find/plt-findfre-1$(EXEEXT) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -@@ -179,27 +183,27 @@ am__v_lt_0 = --silent - am__v_lt_1 = +@@ -185,45 +192,44 @@ libsframe_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(libsframe_la_LDFLAGS) $(LDFLAGS) -o $@ @INSTALL_LIBBFD_FALSE@am_libsframe_la_rpath = @INSTALL_LIBBFD_TRUE@am_libsframe_la_rpath = -rpath $(libdir) -@HAVE_COMPAT_DEJAGNU_TRUE@am__EXEEXT_1 = testsuite/libsframe.decode/be-flipping$(EXEEXT) \ -@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-1$(EXEEXT) \ -@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-2$(EXEEXT) \ --@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.encode/encode-1$(EXEEXT) +-@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.encode/encode-1$(EXEEXT) \ +-@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.find/findfre-1$(EXEEXT) \ +-@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.find/findfunc-1$(EXEEXT) \ +-@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.find/plt-findfre-1$(EXEEXT) am__dirstamp = $(am__leading_dot)dirstamp -am_testsuite_libsframe_decode_be_flipping_OBJECTS = testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.$(OBJEXT) +am_testsuite_libsframe_decode_be_flipping_OBJECTS = \ @@ -19694,7 +20310,27 @@ index 107b82ccfdc..4a4459bf5eb 100644 testsuite_libsframe_encode_encode_1_OBJECTS = \ $(am_testsuite_libsframe_encode_encode_1_OBJECTS) testsuite_libsframe_encode_encode_1_DEPENDENCIES = \ -@@ -218,7 +222,14 @@ am__v_at_0 = @ + ${top_builddir}/libsframe.la +-am_testsuite_libsframe_find_findfre_1_OBJECTS = testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.$(OBJEXT) ++am_testsuite_libsframe_find_findfre_1_OBJECTS = \ ++ testsuite/libsframe.find/findfre_1-findfre-1.$(OBJEXT) + testsuite_libsframe_find_findfre_1_OBJECTS = \ + $(am_testsuite_libsframe_find_findfre_1_OBJECTS) + testsuite_libsframe_find_findfre_1_DEPENDENCIES = \ + ${top_builddir}/libsframe.la +-am_testsuite_libsframe_find_findfunc_1_OBJECTS = testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.$(OBJEXT) ++am_testsuite_libsframe_find_findfunc_1_OBJECTS = \ ++ testsuite/libsframe.find/findfunc_1-findfunc-1.$(OBJEXT) + testsuite_libsframe_find_findfunc_1_OBJECTS = \ + $(am_testsuite_libsframe_find_findfunc_1_OBJECTS) + testsuite_libsframe_find_findfunc_1_DEPENDENCIES = \ + ${top_builddir}/libsframe.la +-am_testsuite_libsframe_find_plt_findfre_1_OBJECTS = testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.$(OBJEXT) ++am_testsuite_libsframe_find_plt_findfre_1_OBJECTS = testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.$(OBJEXT) + testsuite_libsframe_find_plt_findfre_1_OBJECTS = \ + $(am_testsuite_libsframe_find_plt_findfre_1_OBJECTS) + testsuite_libsframe_find_plt_findfre_1_DEPENDENCIES = \ +@@ -242,7 +248,17 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/../depcomp @@ -19706,11 +20342,14 @@ index 107b82ccfdc..4a4459bf5eb 100644 + testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po \ + testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po \ + testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po \ -+ testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po ++ testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po \ ++ testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Po \ ++ testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Po \ ++ testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -295,8 +306,8 @@ am__can_run_installinfo = \ +@@ -325,8 +341,8 @@ am__can_run_installinfo = \ esac am__include_HEADERS_DIST = $(INCDIR)/sframe.h $(INCDIR)/sframe-api.h HEADERS = $(include_HEADERS) @@ -19721,7 +20360,7 @@ index 107b82ccfdc..4a4459bf5eb 100644 # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. -@@ -313,9 +324,6 @@ am__define_uniq_tagged_files = \ +@@ -343,9 +359,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` @@ -19731,7 +20370,7 @@ index 107b82ccfdc..4a4459bf5eb 100644 AM_RECURSIVE_TARGETS = cscope DEJATOOL = $(PACKAGE) RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir -@@ -341,6 +349,8 @@ am__post_remove_distdir = $(am__remove_distdir) +@@ -372,6 +385,8 @@ am__post_remove_distdir = $(am__remove_distdir) DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best DIST_TARGETS = dist-gzip @@ -19740,7 +20379,7 @@ index 107b82ccfdc..4a4459bf5eb 100644 distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' -@@ -359,15 +369,19 @@ CFLAGS = @CFLAGS@ +@@ -390,15 +405,19 @@ CFLAGS = @CFLAGS@ COMPAT_DEJAGNU = @COMPAT_DEJAGNU@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -19760,7 +20399,7 @@ index 107b82ccfdc..4a4459bf5eb 100644 EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ -@@ -386,6 +400,7 @@ LN_S = @LN_S@ +@@ -417,6 +436,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ @@ -19768,7 +20407,7 @@ index 107b82ccfdc..4a4459bf5eb 100644 MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ -@@ -541,8 +556,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -589,8 +609,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ @@ -19777,9 +20416,9 @@ index 107b82ccfdc..4a4459bf5eb 100644 + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; - $(srcdir)/doc/local.mk $(srcdir)/testsuite/local.mk $(srcdir)/testsuite/libsframe.decode/local.mk $(srcdir)/testsuite/libsframe.encode/local.mk $(am__empty): + $(srcdir)/doc/local.mk $(srcdir)/testsuite/local.mk $(srcdir)/testsuite/libsframe.decode/local.mk $(srcdir)/testsuite/libsframe.encode/local.mk $(srcdir)/testsuite/libsframe.find/local.mk $(am__empty): -@@ -570,6 +585,15 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +@@ -618,6 +638,15 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 @@ -19795,10 +20434,10 @@ index 107b82ccfdc..4a4459bf5eb 100644 install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ -@@ -618,36 +642,27 @@ clean-noinstLTLIBRARIES: +@@ -666,36 +695,27 @@ clean-noinstLTLIBRARIES: libsframe.la: $(libsframe_la_OBJECTS) $(libsframe_la_DEPENDENCIES) $(EXTRA_libsframe_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(am_libsframe_la_rpath) $(libsframe_la_OBJECTS) $(libsframe_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libsframe_la_LINK) $(am_libsframe_la_rpath) $(libsframe_la_OBJECTS) $(libsframe_la_LIBADD) $(LIBS) - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -19835,7 +20474,7 @@ index 107b82ccfdc..4a4459bf5eb 100644 testsuite/libsframe.decode/$(am__dirstamp) \ testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp) -@@ -660,7 +675,7 @@ testsuite/libsframe.encode/$(am__dirstamp): +@@ -708,7 +728,7 @@ testsuite/libsframe.encode/$(am__dirstamp): testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) testsuite/libsframe.encode/$(DEPDIR) @: > testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp) @@ -19844,7 +20483,32 @@ index 107b82ccfdc..4a4459bf5eb 100644 testsuite/libsframe.encode/$(am__dirstamp) \ testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp) -@@ -676,13 +691,19 @@ mostlyclean-compile: +@@ -721,21 +741,21 @@ testsuite/libsframe.find/$(am__dirstamp): + testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) testsuite/libsframe.find/$(DEPDIR) + @: > testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp) +-testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.$(OBJEXT): \ ++testsuite/libsframe.find/findfre_1-findfre-1.$(OBJEXT): \ + testsuite/libsframe.find/$(am__dirstamp) \ + testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp) + + testsuite/libsframe.find/findfre-1$(EXEEXT): $(testsuite_libsframe_find_findfre_1_OBJECTS) $(testsuite_libsframe_find_findfre_1_DEPENDENCIES) $(EXTRA_testsuite_libsframe_find_findfre_1_DEPENDENCIES) testsuite/libsframe.find/$(am__dirstamp) + @rm -f testsuite/libsframe.find/findfre-1$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(testsuite_libsframe_find_findfre_1_OBJECTS) $(testsuite_libsframe_find_findfre_1_LDADD) $(LIBS) +-testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.$(OBJEXT): \ ++testsuite/libsframe.find/findfunc_1-findfunc-1.$(OBJEXT): \ + testsuite/libsframe.find/$(am__dirstamp) \ + testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp) + + testsuite/libsframe.find/findfunc-1$(EXEEXT): $(testsuite_libsframe_find_findfunc_1_OBJECTS) $(testsuite_libsframe_find_findfunc_1_DEPENDENCIES) $(EXTRA_testsuite_libsframe_find_findfunc_1_DEPENDENCIES) testsuite/libsframe.find/$(am__dirstamp) + @rm -f testsuite/libsframe.find/findfunc-1$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(testsuite_libsframe_find_findfunc_1_OBJECTS) $(testsuite_libsframe_find_findfunc_1_LDADD) $(LIBS) +-testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.$(OBJEXT): \ ++testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.$(OBJEXT): \ + testsuite/libsframe.find/$(am__dirstamp) \ + testsuite/libsframe.find/$(DEPDIR)/$(am__dirstamp) + +@@ -752,16 +772,22 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -19855,6 +20519,9 @@ index 107b82ccfdc..4a4459bf5eb 100644 -@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-dump.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-error.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe.Plo@am__quote@ # am--include-marker @@ -19862,6 +20529,9 @@ index 107b82ccfdc..4a4459bf5eb 100644 +@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po@am__quote@ # am--include-marker ++@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Po@am__quote@ # am--include-marker ++@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Po@am__quote@ # am--include-marker ++@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) @@ -19871,7 +20541,7 @@ index 107b82ccfdc..4a4459bf5eb 100644 .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@@ -729,61 +750,61 @@ libsframe_la-sframe-error.lo: sframe-error.c +@@ -808,103 +834,103 @@ libsframe_la-sframe-error.lo: sframe-error.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsframe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsframe_la-sframe-error.lo `test -f 'sframe-error.c' || echo '$(srcdir)/'`sframe-error.c @@ -19971,9 +20641,81 @@ index 107b82ccfdc..4a4459bf5eb 100644 -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj `if test -f 'testsuite/libsframe.encode/encode-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.encode/encode-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.encode/encode-1.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.encode/encode_1-encode-1.obj `if test -f 'testsuite/libsframe.encode/encode-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.encode/encode-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.encode/encode-1.c'; fi` +-testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.o: testsuite/libsframe.find/findfre-1.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.o -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Tpo -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.o `test -f 'testsuite/libsframe.find/findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfre-1.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfre-1.c' object='testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.o' libtool=no @AMDEPBACKSLASH@ ++testsuite/libsframe.find/findfre_1-findfre-1.o: testsuite/libsframe.find/findfre-1.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/findfre_1-findfre-1.o -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Tpo -c -o testsuite/libsframe.find/findfre_1-findfre-1.o `test -f 'testsuite/libsframe.find/findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfre-1.c ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfre-1.c' object='testsuite/libsframe.find/findfre_1-findfre-1.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.o `test -f 'testsuite/libsframe.find/findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfre-1.c ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/findfre_1-findfre-1.o `test -f 'testsuite/libsframe.find/findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfre-1.c + +-testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.obj: testsuite/libsframe.find/findfre-1.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.obj -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Tpo -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.obj `if test -f 'testsuite/libsframe.find/findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfre-1.c'; fi` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfre_1-findfre-1.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfre-1.c' object='testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.obj' libtool=no @AMDEPBACKSLASH@ ++testsuite/libsframe.find/findfre_1-findfre-1.obj: testsuite/libsframe.find/findfre-1.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/findfre_1-findfre-1.obj -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Tpo -c -o testsuite/libsframe.find/findfre_1-findfre-1.obj `if test -f 'testsuite/libsframe.find/findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfre-1.c'; fi` ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfre-1.c' object='testsuite/libsframe.find/findfre_1-findfre-1.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfre_1-findfre-1.obj `if test -f 'testsuite/libsframe.find/findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfre-1.c'; fi` ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/findfre_1-findfre-1.obj `if test -f 'testsuite/libsframe.find/findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfre-1.c'; fi` + +-testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.o: testsuite/libsframe.find/findfunc-1.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.o -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Tpo -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.o `test -f 'testsuite/libsframe.find/findfunc-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfunc-1.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Tpo testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfunc-1.c' object='testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.o' libtool=no @AMDEPBACKSLASH@ ++testsuite/libsframe.find/findfunc_1-findfunc-1.o: testsuite/libsframe.find/findfunc-1.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/findfunc_1-findfunc-1.o -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Tpo -c -o testsuite/libsframe.find/findfunc_1-findfunc-1.o `test -f 'testsuite/libsframe.find/findfunc-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfunc-1.c ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Tpo testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfunc-1.c' object='testsuite/libsframe.find/findfunc_1-findfunc-1.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.o `test -f 'testsuite/libsframe.find/findfunc-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfunc-1.c ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/findfunc_1-findfunc-1.o `test -f 'testsuite/libsframe.find/findfunc-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/findfunc-1.c + +-testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.obj: testsuite/libsframe.find/findfunc-1.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.obj -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Tpo -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.obj `if test -f 'testsuite/libsframe.find/findfunc-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfunc-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfunc-1.c'; fi` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Tpo testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_findfunc_1-findfunc-1.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfunc-1.c' object='testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.obj' libtool=no @AMDEPBACKSLASH@ ++testsuite/libsframe.find/findfunc_1-findfunc-1.obj: testsuite/libsframe.find/findfunc-1.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/findfunc_1-findfunc-1.obj -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Tpo -c -o testsuite/libsframe.find/findfunc_1-findfunc-1.obj `if test -f 'testsuite/libsframe.find/findfunc-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfunc-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfunc-1.c'; fi` ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Tpo testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/findfunc-1.c' object='testsuite/libsframe.find/findfunc_1-findfunc-1.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/testsuite_libsframe_find_findfunc_1-findfunc-1.obj `if test -f 'testsuite/libsframe.find/findfunc-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfunc-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfunc-1.c'; fi` ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_findfunc_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/findfunc_1-findfunc-1.obj `if test -f 'testsuite/libsframe.find/findfunc-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/findfunc-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/findfunc-1.c'; fi` + +-testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.o: testsuite/libsframe.find/plt-findfre-1.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.o -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Tpo -c -o testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.o `test -f 'testsuite/libsframe.find/plt-findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/plt-findfre-1.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/plt-findfre-1.c' object='testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.o' libtool=no @AMDEPBACKSLASH@ ++testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.o: testsuite/libsframe.find/plt-findfre-1.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.o -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Tpo -c -o testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.o `test -f 'testsuite/libsframe.find/plt-findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/plt-findfre-1.c ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/plt-findfre-1.c' object='testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.o `test -f 'testsuite/libsframe.find/plt-findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/plt-findfre-1.c ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.o `test -f 'testsuite/libsframe.find/plt-findfre-1.c' || echo '$(srcdir)/'`testsuite/libsframe.find/plt-findfre-1.c + +-testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.obj: testsuite/libsframe.find/plt-findfre-1.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.obj -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Tpo -c -o testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.obj `if test -f 'testsuite/libsframe.find/plt-findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/plt-findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/plt-findfre-1.c'; fi` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/plt-findfre-1.c' object='testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.obj' libtool=no @AMDEPBACKSLASH@ ++testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.obj: testsuite/libsframe.find/plt-findfre-1.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.obj -MD -MP -MF testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Tpo -c -o testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.obj `if test -f 'testsuite/libsframe.find/plt-findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/plt-findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/plt-findfre-1.c'; fi` ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Tpo testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.find/plt-findfre-1.c' object='testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/testsuite_libsframe_find_plt_findfre_1-plt-findfre-1.obj `if test -f 'testsuite/libsframe.find/plt-findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/plt-findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/plt-findfre-1.c'; fi` ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_find_plt_findfre_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.find/plt_findfre_1-plt-findfre-1.obj `if test -f 'testsuite/libsframe.find/plt-findfre-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.find/plt-findfre-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.find/plt-findfre-1.c'; fi` + mostlyclean-libtool: -rm -f *.lo -@@ -1020,7 +1041,7 @@ site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG) +@@ -1142,7 +1168,7 @@ site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG) @echo '# Do not edit here. If you wish to override these values' >>site.tmp @echo '# edit the last section' >>site.tmp @echo 'set srcdir "$(srcdir)"' >>site.tmp @@ -19982,7 +20724,7 @@ index 107b82ccfdc..4a4459bf5eb 100644 @echo 'set build_alias "$(build_alias)"' >>site.tmp @echo 'set build_triplet $(build_triplet)' >>site.tmp @echo 'set host_alias "$(host_alias)"' >>site.tmp -@@ -1044,8 +1065,10 @@ distclean-DEJAGNU: +@@ -1166,8 +1192,10 @@ distclean-DEJAGNU: -l='$(DEJATOOL)'; for tool in $$l; do \ rm -f $$tool.sum $$tool.log; \ done @@ -19994,7 +20736,7 @@ index 107b82ccfdc..4a4459bf5eb 100644 $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -@@ -1103,6 +1126,10 @@ dist-xz: distdir +@@ -1225,6 +1253,10 @@ dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) @@ -20005,7 +20747,7 @@ index 107b82ccfdc..4a4459bf5eb 100644 dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 -@@ -1145,6 +1172,8 @@ distcheck: dist +@@ -1267,6 +1299,8 @@ distcheck: dist eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ @@ -20014,7 +20756,7 @@ index 107b82ccfdc..4a4459bf5eb 100644 esac chmod -R a-w $(distdir) chmod u+w $(distdir) -@@ -1160,7 +1189,7 @@ distcheck: dist +@@ -1282,7 +1316,7 @@ distcheck: dist $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ @@ -20023,7 +20765,7 @@ index 107b82ccfdc..4a4459bf5eb 100644 && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ -@@ -1216,6 +1245,8 @@ check-am: all-am +@@ -1338,6 +1372,8 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU check: check-am all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) config.h @@ -20032,11 +20774,11 @@ index 107b82ccfdc..4a4459bf5eb 100644 installdirs: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -@@ -1266,7 +1297,13 @@ clean-am: clean-aminfo clean-checkPROGRAMS clean-generic \ +@@ -1390,7 +1426,16 @@ clean-am: clean-aminfo clean-checkPROGRAMS clean-generic \ distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -- -rm -rf ./$(DEPDIR) testsuite/libsframe.decode/$(DEPDIR) testsuite/libsframe.encode/$(DEPDIR) +- -rm -rf ./$(DEPDIR) testsuite/libsframe.decode/$(DEPDIR) testsuite/libsframe.encode/$(DEPDIR) testsuite/libsframe.find/$(DEPDIR) + -rm -f ./$(DEPDIR)/libsframe_la-sframe-dump.Plo + -rm -f ./$(DEPDIR)/libsframe_la-sframe-error.Plo + -rm -f ./$(DEPDIR)/libsframe_la-sframe.Plo @@ -20044,14 +20786,17 @@ index 107b82ccfdc..4a4459bf5eb 100644 + -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po + -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po + -rm -f testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po ++ -rm -f testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Po ++ -rm -f testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Po ++ -rm -f testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Po -rm -f Makefile distclean-am: clean-am distclean-DEJAGNU distclean-compile \ distclean-generic distclean-hdr distclean-libtool \ -@@ -1406,7 +1443,13 @@ installcheck-am: +@@ -1530,7 +1575,16 @@ installcheck-am: maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache -- -rm -rf ./$(DEPDIR) testsuite/libsframe.decode/$(DEPDIR) testsuite/libsframe.encode/$(DEPDIR) +- -rm -rf ./$(DEPDIR) testsuite/libsframe.decode/$(DEPDIR) testsuite/libsframe.encode/$(DEPDIR) testsuite/libsframe.find/$(DEPDIR) + -rm -f ./$(DEPDIR)/libsframe_la-sframe-dump.Plo + -rm -f ./$(DEPDIR)/libsframe_la-sframe-error.Plo + -rm -f ./$(DEPDIR)/libsframe_la-sframe.Plo @@ -20059,10 +20804,13 @@ index 107b82ccfdc..4a4459bf5eb 100644 + -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po + -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po + -rm -f testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po ++ -rm -f testsuite/libsframe.find/$(DEPDIR)/findfre_1-findfre-1.Po ++ -rm -f testsuite/libsframe.find/$(DEPDIR)/findfunc_1-findfunc-1.Po ++ -rm -f testsuite/libsframe.find/$(DEPDIR)/plt_findfre_1-plt-findfre-1.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-aminfo \ maintainer-clean-generic -@@ -1430,28 +1473,28 @@ uninstall-am: uninstall-dvi-am uninstall-html-am \ +@@ -1554,28 +1608,28 @@ uninstall-am: uninstall-dvi-am uninstall-html-am \ .MAKE: all check-am install-am install-strip @@ -20561,10 +21309,10 @@ index b0cdd6b184d..c83d4f62ece 100644 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/libsframe/configure b/libsframe/configure -index 7bbed5d8ccf..795e7802110 100755 +index f7ad9c5e29a..78e875956ae 100755 --- a/libsframe/configure +++ b/libsframe/configure -@@ -654,6 +654,8 @@ OTOOL +@@ -658,6 +658,8 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -20573,7 +21321,7 @@ index 7bbed5d8ccf..795e7802110 100755 OBJDUMP LN_S NM -@@ -678,6 +680,9 @@ AM_BACKSLASH +@@ -682,6 +684,9 @@ AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V @@ -20583,7 +21331,7 @@ index 7bbed5d8ccf..795e7802110 100755 am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE -@@ -685,7 +690,6 @@ am__nodep +@@ -689,7 +694,6 @@ am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -20591,7 +21339,7 @@ index 7bbed5d8ccf..795e7802110 100755 am__include DEPDIR am__untar -@@ -758,7 +762,8 @@ PACKAGE_VERSION +@@ -762,7 +766,8 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR @@ -20601,7 +21349,7 @@ index 7bbed5d8ccf..795e7802110 100755 ac_subst_files='' ac_user_opts=' enable_option_checking -@@ -769,6 +774,7 @@ enable_static +@@ -773,6 +778,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -20609,7 +21357,7 @@ index 7bbed5d8ccf..795e7802110 100755 enable_libtool_lock enable_largefile enable_maintainer_mode -@@ -1424,6 +1430,8 @@ Optional Packages: +@@ -1428,6 +1434,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -20618,7 +21366,7 @@ index 7bbed5d8ccf..795e7802110 100755 Some influential environment variables: CC C compiler command -@@ -3606,7 +3614,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } +@@ -3610,7 +3618,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h @@ -20627,7 +21375,7 @@ index 7bbed5d8ccf..795e7802110 100755 # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or -@@ -3779,12 +3787,7 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +@@ -3783,12 +3791,7 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` if test x"${MISSING+set}" != xset; then @@ -20641,7 +21389,7 @@ index 7bbed5d8ccf..795e7802110 100755 fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then -@@ -4032,45 +4035,45 @@ DEPDIR="${am__leading_dot}deps" +@@ -4036,45 +4039,45 @@ DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -20720,7 +21468,7 @@ index 7bbed5d8ccf..795e7802110 100755 # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : -@@ -4182,8 +4185,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +@@ -4186,8 +4189,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: @@ -20731,7 +21479,7 @@ index 7bbed5d8ccf..795e7802110 100755 mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The -@@ -4330,6 +4333,20 @@ else +@@ -4334,6 +4337,20 @@ else fi @@ -20752,7 +21500,7 @@ index 7bbed5d8ccf..795e7802110 100755 # POSIX will say in a future version that running "rm -f" with no argument # is OK; and we want to be able to make that assumption in our Makefile -@@ -4362,7 +4379,7 @@ END +@@ -4366,7 +4383,7 @@ END Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation @@ -20761,7 +21509,7 @@ index 7bbed5d8ccf..795e7802110 100755 If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -@@ -5308,8 +5325,8 @@ esac +@@ -5351,8 +5368,8 @@ esac @@ -20772,7 +21520,7 @@ index 7bbed5d8ccf..795e7802110 100755 -@@ -5420,7 +5437,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5463,7 +5480,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -20781,7 +21529,7 @@ index 7bbed5d8ccf..795e7802110 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6113,8 +6130,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6156,8 +6173,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -20792,7 +21540,7 @@ index 7bbed5d8ccf..795e7802110 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6163,6 +6180,80 @@ esac +@@ -6206,6 +6223,80 @@ esac @@ -20873,7 +21621,7 @@ index 7bbed5d8ccf..795e7802110 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6179,6 +6270,11 @@ case $reload_flag in +@@ -6222,6 +6313,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -20885,7 +21633,7 @@ index 7bbed5d8ccf..795e7802110 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6347,7 +6443,8 @@ mingw* | pw32*) +@@ -6390,7 +6486,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -20895,7 +21643,7 @@ index 7bbed5d8ccf..795e7802110 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6501,6 +6598,21 @@ esac +@@ -6544,6 +6641,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -20917,7 +21665,7 @@ index 7bbed5d8ccf..795e7802110 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6516,6 +6628,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6559,6 +6671,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -21075,7 +21823,7 @@ index 7bbed5d8ccf..795e7802110 100755 plugin_option= plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" for plugin in $plugin_names; do -@@ -6530,8 +6793,10 @@ for plugin in $plugin_names; do +@@ -6573,8 +6836,10 @@ for plugin in $plugin_names; do done if test -n "$ac_tool_prefix"; then @@ -21088,7 +21836,7 @@ index 7bbed5d8ccf..795e7802110 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6547,7 +6812,7 @@ do +@@ -6590,7 +6855,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -21097,7 +21845,7 @@ index 7bbed5d8ccf..795e7802110 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6567,11 +6832,15 @@ $as_echo "no" >&6; } +@@ -6610,11 +6875,15 @@ $as_echo "no" >&6; } fi @@ -21116,7 +21864,7 @@ index 7bbed5d8ccf..795e7802110 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6587,7 +6856,7 @@ do +@@ -6630,7 +6899,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -21125,7 +21873,7 @@ index 7bbed5d8ccf..795e7802110 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6606,6 +6875,10 @@ else +@@ -6649,6 +6918,10 @@ else $as_echo "no" >&6; } fi @@ -21136,7 +21884,7 @@ index 7bbed5d8ccf..795e7802110 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6617,29 +6890,81 @@ ac_tool_warned=yes ;; +@@ -6660,29 +6933,81 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -21233,7 +21981,7 @@ index 7bbed5d8ccf..795e7802110 100755 -@@ -6986,8 +7311,8 @@ esac +@@ -7029,8 +7354,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -21244,7 +21992,7 @@ index 7bbed5d8ccf..795e7802110 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -7023,6 +7348,7 @@ for ac_symprfx in "" "_"; do +@@ -7066,6 +7391,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -21252,7 +22000,7 @@ index 7bbed5d8ccf..795e7802110 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7064,6 +7390,18 @@ _LT_EOF +@@ -7107,6 +7433,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -21271,7 +22019,7 @@ index 7bbed5d8ccf..795e7802110 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7075,7 +7413,7 @@ _LT_EOF +@@ -7118,7 +7456,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -21280,7 +22028,7 @@ index 7bbed5d8ccf..795e7802110 100755 const char *name; void *address; } -@@ -7101,8 +7439,8 @@ static const void *lt_preloaded_setup() { +@@ -7144,8 +7482,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -21291,7 +22039,7 @@ index 7bbed5d8ccf..795e7802110 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7112,8 +7450,8 @@ _LT_EOF +@@ -7155,8 +7493,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -21302,7 +22050,7 @@ index 7bbed5d8ccf..795e7802110 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7150,6 +7488,16 @@ else +@@ -7193,6 +7531,16 @@ else $as_echo "ok" >&6; } fi @@ -21319,7 +22067,7 @@ index 7bbed5d8ccf..795e7802110 100755 -@@ -7166,6 +7514,45 @@ fi +@@ -7209,6 +7557,45 @@ fi @@ -21365,7 +22113,7 @@ index 7bbed5d8ccf..795e7802110 100755 -@@ -7371,11 +7758,128 @@ sparc*-*solaris*) +@@ -7414,11 +7801,128 @@ sparc*-*solaris*) ;; esac fi @@ -21497,7 +22245,7 @@ index 7bbed5d8ccf..795e7802110 100755 case $host_os in -@@ -7940,6 +8444,8 @@ _LT_EOF +@@ -7983,6 +8487,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -21506,7 +22254,7 @@ index 7bbed5d8ccf..795e7802110 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8492,8 +8998,6 @@ fi +@@ -8535,8 +9041,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -21515,7 +22263,7 @@ index 7bbed5d8ccf..795e7802110 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8659,6 +9163,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8702,6 +9206,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -21528,7 +22276,7 @@ index 7bbed5d8ccf..795e7802110 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8721,7 +9231,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8764,7 +9274,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -21537,7 +22285,7 @@ index 7bbed5d8ccf..795e7802110 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8778,13 +9288,17 @@ case $host_os in +@@ -8821,13 +9331,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -21561,7 +22309,7 @@ index 7bbed5d8ccf..795e7802110 100755 # # Check to make sure the PIC flag actually works. -@@ -8845,6 +9359,11 @@ fi +@@ -8888,6 +9402,11 @@ fi @@ -21573,7 +22321,7 @@ index 7bbed5d8ccf..795e7802110 100755 # # Check to make sure the static flag actually works. # -@@ -9195,7 +9714,8 @@ _LT_EOF +@@ -9238,7 +9757,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -21583,7 +22331,7 @@ index 7bbed5d8ccf..795e7802110 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9294,12 +9814,12 @@ _LT_EOF +@@ -9337,12 +9857,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -21598,7 +22346,7 @@ index 7bbed5d8ccf..795e7802110 100755 fi ;; esac -@@ -9313,8 +9833,8 @@ _LT_EOF +@@ -9356,8 +9876,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -21609,7 +22357,7 @@ index 7bbed5d8ccf..795e7802110 100755 fi ;; -@@ -9332,8 +9852,8 @@ _LT_EOF +@@ -9375,8 +9895,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -21620,7 +22368,7 @@ index 7bbed5d8ccf..795e7802110 100755 else ld_shlibs=no fi -@@ -9379,8 +9899,8 @@ _LT_EOF +@@ -9422,8 +9942,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -21631,7 +22379,7 @@ index 7bbed5d8ccf..795e7802110 100755 else ld_shlibs=no fi -@@ -9510,7 +10030,13 @@ _LT_EOF +@@ -9553,7 +10073,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -21646,7 +22394,7 @@ index 7bbed5d8ccf..795e7802110 100755 /* end confdefs.h. */ int -@@ -9523,22 +10049,29 @@ main () +@@ -9566,22 +10092,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -21689,7 +22437,7 @@ index 7bbed5d8ccf..795e7802110 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9550,7 +10083,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9593,7 +10126,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -21704,7 +22452,7 @@ index 7bbed5d8ccf..795e7802110 100755 /* end confdefs.h. */ int -@@ -9563,22 +10102,29 @@ main () +@@ -9606,22 +10145,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -21747,7 +22495,7 @@ index 7bbed5d8ccf..795e7802110 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9623,20 +10169,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9666,20 +10212,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -21825,7 +22573,7 @@ index 7bbed5d8ccf..795e7802110 100755 ;; darwin* | rhapsody*) -@@ -9697,7 +10286,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9740,7 +10329,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -21834,7 +22582,7 @@ index 7bbed5d8ccf..795e7802110 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9705,7 +10294,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9748,7 +10337,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -21843,7 +22591,7 @@ index 7bbed5d8ccf..795e7802110 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9721,7 +10310,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9764,7 +10353,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -21852,7 +22600,7 @@ index 7bbed5d8ccf..795e7802110 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9745,10 +10334,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9788,10 +10377,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -21865,7 +22613,7 @@ index 7bbed5d8ccf..795e7802110 100755 ;; esac else -@@ -9827,23 +10416,36 @@ fi +@@ -9870,23 +10459,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -21910,7 +22658,7 @@ index 7bbed5d8ccf..795e7802110 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9928,7 +10530,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9971,7 +10573,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -21919,7 +22667,7 @@ index 7bbed5d8ccf..795e7802110 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9947,9 +10549,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9990,9 +10592,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -21931,7 +22679,7 @@ index 7bbed5d8ccf..795e7802110 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10525,8 +11127,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10568,8 +11170,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -21943,7 +22691,7 @@ index 7bbed5d8ccf..795e7802110 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10559,13 +11162,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10602,13 +11205,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -22016,16 +22764,16 @@ index 7bbed5d8ccf..795e7802110 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -11443,7 +12104,7 @@ else +@@ -11486,7 +12147,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11446 "configure" +-#line 11489 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11487,10 +12148,10 @@ else +@@ -11530,10 +12191,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -22038,16 +22786,16 @@ index 7bbed5d8ccf..795e7802110 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11549,7 +12210,7 @@ else +@@ -11592,7 +12253,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11552 "configure" +-#line 11595 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11593,10 +12254,10 @@ else +@@ -11636,10 +12297,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -22060,7 +22808,7 @@ index 7bbed5d8ccf..795e7802110 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -13361,7 +14022,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +@@ -13459,7 +14120,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # @@ -22069,7 +22817,7 @@ index 7bbed5d8ccf..795e7802110 100755 # The HP-UX ksh and POSIX shell print the target directory to stdout -@@ -13399,13 +14060,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -13497,13 +14158,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -22090,7 +22838,7 @@ index 7bbed5d8ccf..795e7802110 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13420,14 +14088,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -13518,14 +14186,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -22109,7 +22857,7 @@ index 7bbed5d8ccf..795e7802110 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13460,12 +14131,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -13558,12 +14229,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -22123,7 +22871,7 @@ index 7bbed5d8ccf..795e7802110 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13520,8 +14191,13 @@ reload_flag \ +@@ -13618,8 +14289,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -22137,7 +22885,7 @@ index 7bbed5d8ccf..795e7802110 100755 STRIP \ RANLIB \ CC \ -@@ -13531,12 +14207,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -13629,12 +14305,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -22153,7 +22901,7 @@ index 7bbed5d8ccf..795e7802110 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -13552,7 +14230,6 @@ no_undefined_flag \ +@@ -13650,7 +14328,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -22161,7 +22909,7 @@ index 7bbed5d8ccf..795e7802110 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -13588,6 +14265,7 @@ module_cmds \ +@@ -13686,6 +14363,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -22169,7 +22917,7 @@ index 7bbed5d8ccf..795e7802110 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -14234,29 +14912,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} +@@ -14332,29 +15010,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. @@ -22224,7 +22972,7 @@ index 7bbed5d8ccf..795e7802110 100755 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -14274,53 +14958,50 @@ $as_echo X"$mf" | +@@ -14372,53 +15056,50 @@ $as_echo X"$mf" | q } s/.*/./; q'` @@ -22311,7 +23059,7 @@ index 7bbed5d8ccf..795e7802110 100755 } ;; "libtool":C) -@@ -14344,7 +15025,8 @@ $as_echo X"$file" | +@@ -14442,7 +15123,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -22321,7 +23069,7 @@ index 7bbed5d8ccf..795e7802110 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -14447,19 +15129,42 @@ SP2NL=$lt_lt_SP2NL +@@ -14545,19 +15227,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -22365,7 +23113,7 @@ index 7bbed5d8ccf..795e7802110 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -14489,6 +15194,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -14587,6 +15292,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -22378,7 +23126,7 @@ index 7bbed5d8ccf..795e7802110 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -14498,6 +15209,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -14596,6 +15307,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -22388,7 +23136,7 @@ index 7bbed5d8ccf..795e7802110 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -14612,12 +15326,12 @@ with_gcc=$GCC +@@ -14710,12 +15424,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -22404,7 +23152,7 @@ index 7bbed5d8ccf..795e7802110 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -14704,9 +15418,6 @@ inherit_rpath=$inherit_rpath +@@ -14802,9 +15516,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -22414,7 +23162,7 @@ index 7bbed5d8ccf..795e7802110 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -14722,6 +15433,9 @@ include_expsyms=$lt_include_expsyms +@@ -14820,6 +15531,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -22424,7 +23172,7 @@ index 7bbed5d8ccf..795e7802110 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -14754,210 +15468,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -14852,210 +15566,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -29878,7 +30626,7 @@ index bf92b5e0790..c573da90c5c 100644 # These exist entirely to fool aclocal when bootstrapping libtool. # diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in -index c1eca5a42ed..7cab295b26d 100644 +index 2db307e8d7c..aa6e3e1b429 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -292,6 +292,7 @@ CYGPATH_W = @CYGPATH_W@ @@ -29906,7 +30654,7 @@ index c1eca5a42ed..7cab295b26d 100644 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ diff --git a/opcodes/configure b/opcodes/configure -index d2364991ee8..f9a46eec7a3 100755 +index fc4109a1a47..6c42352868c 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -682,6 +682,9 @@ OTOOL @@ -31817,1945 +32565,6 @@ index d2364991ee8..f9a46eec7a3 100755 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -diff --git a/sim/Makefile.in b/sim/Makefile.in -index 65085cada9c..c216f21920f 100644 ---- a/sim/Makefile.in -+++ b/sim/Makefile.in -@@ -1029,6 +1029,7 @@ CYGPATH_W = @CYGPATH_W@ - C_DIALECT = @C_DIALECT@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DTC = @DTC@ - DUMPBIN = @DUMPBIN@ -@@ -1089,6 +1090,7 @@ LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -1150,6 +1152,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ - am__include = @am__include@ -diff --git a/sim/configure b/sim/configure -index c31ff71c805..1936741abe2 100755 ---- a/sim/configure -+++ b/sim/configure -@@ -887,8 +887,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - AWK - STRIP -+ac_ct_AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -991,6 +994,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_maintainer_mode - enable_dependency_tracking -@@ -1809,6 +1813,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -5642,8 +5648,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5683,7 +5689,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6376,8 +6382,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6426,6 +6432,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6442,6 +6522,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6610,7 +6695,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6764,6 +6850,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6779,6 +6880,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ - plugin_option= - plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" - for plugin in $plugin_names; do -@@ -6793,8 +7045,10 @@ for plugin in $plugin_names; do - done - - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6810,7 +7064,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6830,11 +7084,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6850,7 +7108,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6869,6 +7127,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6880,29 +7142,81 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --if test -n "$plugin_option"; then -- if $AR --help 2>&1 | grep -q "\--plugin"; then -- touch conftest.c -- $AR $plugin_option rc conftest.a conftest.c -- if test "$?" != 0; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 -+ touch conftest.c -+ $AR $plugin_option rc conftest.a conftest.c -+ if test "$?" != 0; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 - $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} -- else -- AR="$AR $plugin_option" -- fi -- rm -f conftest.* -+ else -+ AR="$AR $plugin_option" - fi --fi --test -z "$AR_FLAGS" && AR_FLAGS=cru -+ rm -f conftest.* -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ - -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a - -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } - -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi - - - -@@ -7291,8 +7605,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7328,6 +7642,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7369,6 +7684,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7380,7 +7707,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7406,8 +7733,8 @@ static const void *lt_preloaded_setup() { - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7417,8 +7744,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7455,6 +7782,14 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ - - - -@@ -7473,6 +7808,47 @@ fi - - - -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ - - - -@@ -7682,6 +8058,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -8245,6 +8738,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -9499,8 +9994,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -9666,6 +10159,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -9728,7 +10227,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -9785,13 +10284,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -9852,6 +10355,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -10202,7 +10710,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -10301,12 +10810,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -10320,8 +10829,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -10339,8 +10848,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -10386,8 +10895,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -10517,7 +11026,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -10530,22 +11045,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -10557,7 +11079,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -10570,22 +11098,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -10630,20 +11165,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -10704,7 +11282,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -10712,7 +11290,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -10728,7 +11306,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -10752,10 +11330,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -10834,23 +11412,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10935,7 +11526,7 @@ rm -f core conftest.err conftest.$ac_objext \ - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10954,9 +11545,9 @@ rm -f core conftest.err conftest.$ac_objext \ - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -11532,8 +12123,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -11566,13 +12158,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -12450,7 +13100,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12453 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12494,10 +13144,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12556,7 +13206,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12559 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12600,10 +13250,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -17596,13 +18246,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -17617,14 +18274,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -17657,12 +18317,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -17717,8 +18377,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -17728,12 +18393,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -17749,7 +18416,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -17785,6 +18451,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -18610,7 +19277,8 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -18713,19 +19381,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -18755,6 +19446,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -18764,6 +19461,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -18878,12 +19578,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -18970,9 +19670,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -18988,6 +19685,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -19020,210 +19720,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -- -- -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) -+ -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi -+ -+ -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - diff --git a/zlib/Makefile.in b/zlib/Makefile.in index 855c23eea23..0605835c14f 100644 --- a/zlib/Makefile.in diff --git a/poky/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/poky/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch index afd694db4d..acd827143a 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch @@ -1,4 +1,4 @@ -From ff2754e302d06df51f8dd8ef877afb65eb30fcab Mon Sep 17 00:00:00 2001 +From 73d1af65ccfed87662342274d9ec33900786beb3 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:42:38 +0000 Subject: [PATCH] Fix rpath in libtool when sysroot is enabled diff --git a/poky/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch b/poky/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch index cc0fb551b2..faf5f2c0b8 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch @@ -1,4 +1,4 @@ -From 039b4afd7d3b5a599aebee97410809276a622ccd Mon Sep 17 00:00:00 2001 +From da9dc36e90c6cf7d3d3bf6f4e337261a93d63428 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Mon, 6 Mar 2017 23:33:27 -0800 Subject: [PATCH] sync with OE libtool changes diff --git a/poky/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch b/poky/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch index b921dd1218..05c73171f5 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch @@ -1,4 +1,4 @@ -From 4eb24605fb2012c0f02883d1f560d5d852c0705e Mon Sep 17 00:00:00 2001 +From f6105e5202180627e9690884d483fd5b7dc28652 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 15 Apr 2020 14:17:20 -0700 Subject: [PATCH] Check for clang before checking gcc version diff --git a/poky/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/poky/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch index f69071ae96..20eb943d65 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch @@ -1,4 +1,4 @@ -From 9613e47bfdea18d2764eec130676e3e0b40c676f Mon Sep 17 00:00:00 2001 +From 13cbec5bc5c75dd4c3e1d5f3ca80e5b64f7116d1 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 10 Mar 2022 21:21:33 -0800 Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 5 insertions(+) diff --git a/ld/ldelf.c b/ld/ldelf.c -index 95787012b89..bc29909386f 100644 +index 1519f8ac4e5..2a7c76dc29c 100644 --- a/ld/ldelf.c +++ b/ld/ldelf.c @@ -1127,6 +1127,9 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab, @@ -27,7 +27,7 @@ index 95787012b89..bc29909386f 100644 if (path && ldelf_search_needed (path, &n, force, is_linux, elfsize)) -@@ -1801,6 +1804,8 @@ ldelf_before_allocation (char *audit, char *depaudit, +@@ -1802,6 +1805,8 @@ ldelf_before_allocation (char *audit, char *depaudit, rpath = command_line.rpath; if (rpath == NULL) rpath = (const char *) getenv ("LD_RUN_PATH"); diff --git a/poky/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch b/poky/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch index 9cdc7e219d..a6892e8af6 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch @@ -1,4 +1,4 @@ -From 8af01d85c4e5a5558d770291b7df86acfd59827c Mon Sep 17 00:00:00 2001 +From 9d451ca9ca6bf34b43a089033565ae7570db2065 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 15 Jan 2023 00:16:25 -0800 Subject: [PATCH] Define alignof using _Alignof when using C11 or newer diff --git a/poky/meta/recipes-devtools/binutils/binutils/0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch b/poky/meta/recipes-devtools/binutils/binutils/0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch index f57f65ce72..818d646ffe 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch @@ -1,4 +1,4 @@ -From 9599d7d48913fca4c2bf0d0012f9655353ca6f6c Mon Sep 17 00:00:00 2001 +From f0c39effd46d4dec0813276b1903d6deddcd82dc Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Jan 2023 19:35:07 -0800 Subject: [PATCH] Remove duplicate pe-dll.o entry deom targ_extra_ofiles @@ -14,14 +14,14 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Jedidiah Thompson <wej22007@outlook.com> Cc: Zac Walker <zac.walker@linaro.org> --- - ld/configure.tgt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + ld/configure.tgt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ld/configure.tgt b/ld/configure.tgt -index de04a44b812..f80c84ab13c 100644 +index c62b9581d9b..e78644d04e2 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -1056,7 +1056,7 @@ x86_64-*-cygwin) targ_emul=i386pep ; +@@ -1055,7 +1055,7 @@ x86_64-*-cygwin) targ_emul=i386pep ; ;; x86_64-*-mingw*) targ_emul=i386pep ; targ_extra_emuls=i386pe diff --git a/poky/meta/recipes-devtools/binutils/binutils/0015-gprofng-Fix-build-with-64bit-file-offset-on-32bit-ma.patch b/poky/meta/recipes-devtools/binutils/binutils/0015-gprofng-Fix-build-with-64bit-file-offset-on-32bit-ma.patch new file mode 100644 index 0000000000..3bb083819b --- /dev/null +++ b/poky/meta/recipes-devtools/binutils/binutils/0015-gprofng-Fix-build-with-64bit-file-offset-on-32bit-ma.patch @@ -0,0 +1,55 @@ +From 15936ae7cdfd6814654eff367b5cfb2565ea6af8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 31 Jul 2023 15:23:38 -0700 +Subject: [PATCH] gprofng: Fix build with 64bit file offset on 32bit machines + +gprofng/ChangeLog +2023-07-31 Khem Raj <raj.khem@gmail.com> + +* libcollector/iotrace.c: Define open64, fgetpos64, and fsetpos64 + only when __USE_LARGEFILE64 and __USE_FILE_OFFSET64 are not + defined. + +Upstream-Status: Submitted [https://sourceware.org/pipermail/binutils/2023-July/128741.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gprofng/libcollector/iotrace.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/gprofng/libcollector/iotrace.c b/gprofng/libcollector/iotrace.c +index c0ea7497b09..81c844048d9 100644 +--- a/gprofng/libcollector/iotrace.c ++++ b/gprofng/libcollector/iotrace.c +@@ -1030,8 +1030,9 @@ gprofng_open64 (int(real_open64) (const char *, int, ...), + } + + DCL_FUNC_VER (DCL_OPEN64, open64_2_2, open64@GLIBC_2.2) ++#if !defined(__USE_LARGEFILE64) + DCL_OPEN64 (open64) +- ++#endif + + #define F_ERROR_ARG 0 + #define F_INT_ARG 1 +@@ -2989,8 +2990,9 @@ DCL_FUNC_VER (DCL_FGETPOS64, fgetpos64_2_17, fgetpos64@GLIBC_2.17) + DCL_FUNC_VER (DCL_FGETPOS64, fgetpos64_2_2_5, fgetpos64@GLIBC_2.2.5) + DCL_FUNC_VER (DCL_FGETPOS64, fgetpos64_2_2, fgetpos64@GLIBC_2.2) + DCL_FUNC_VER (DCL_FGETPOS64, fgetpos64_2_1, fgetpos64@GLIBC_2.1) ++#if !defined(__USE_LARGEFILE64) + DCL_FGETPOS64 (fgetpos64) +- ++#endif + /*------------------------------------------------------------- fsetpos */ + static int + gprofng_fsetpos (int(real_fsetpos) (FILE *, const fpos_t *), +@@ -3087,8 +3089,9 @@ DCL_FUNC_VER (DCL_FSETPOS64, fsetpos64_2_17, fsetpos64@GLIBC_2.17) + DCL_FUNC_VER (DCL_FSETPOS64, fsetpos64_2_2_5, fsetpos64@GLIBC_2.2.5) + DCL_FUNC_VER (DCL_FSETPOS64, fsetpos64_2_2, fsetpos64@GLIBC_2.2) + DCL_FUNC_VER (DCL_FSETPOS64, fsetpos64_2_1, fsetpos64@GLIBC_2.1) ++#if !defined(__USE_LARGEFILE64) + DCL_FSETPOS64 (fsetpos64) +- ++#endif + /*------------------------------------------------------------- fsync */ + int + fsync (int fildes) diff --git a/poky/meta/recipes-devtools/binutils/binutils/0016-CVE-2023-25586.patch b/poky/meta/recipes-devtools/binutils/binutils/0016-CVE-2023-25586.patch deleted file mode 100644 index 43e36caf3f..0000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/0016-CVE-2023-25586.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5830876a0cca17bef3b2d54908928e72cca53502 Mon Sep 17 00:00:00 2001 -From: Alan Modra <amodra@gmail.com> -Date: Tue, 6 Dec 2022 08:37:52 +1030 -Subject: [PATCH] PR29855, ch_type in bfd_init_section_decompress_status can be - uninitialized - - PR 29855 - * compress.c (bfd_init_section_decompress_status): Set ch_type - to zero for zlib-gnu case. - -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5830876a0cca17bef3b2d54908928e72cca53502] - -CVE: CVE-2023-25586 - -Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com> ---- - bfd/compress.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/bfd/compress.c b/bfd/compress.c -index 3d8c1d769f1..6b083468ca8 100644 ---- a/bfd/compress.c -+++ b/bfd/compress.c -@@ -1012,7 +1012,7 @@ bfd_init_section_decompress_status (bfd *abfd, sec_ptr sec) - return false; - } - uncompressed_size = bfd_getb64 (header + 4); -- ch_type = ch_none; -+ ch_type = 0; - } - else if (!bfd_check_compression_header (abfd, header, sec, - &ch_type, --- -2.31.1 diff --git a/poky/meta/recipes-devtools/binutils/binutils/fix-time64.patch b/poky/meta/recipes-devtools/binutils/binutils/fix-time64.patch deleted file mode 100644 index 0bfc977fd4..0000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/fix-time64.patch +++ /dev/null @@ -1,94 +0,0 @@ -From f6f19a39ecfe962cb8a05522c27f513308687a74 Mon Sep 17 00:00:00 2001 -From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com> -Date: Thu, 16 Feb 2023 19:00:47 -0800 -Subject: [PATCH] gprofng: PR30036 Build failure on aarch64 w/ glibc: symbol - `pwrite64' is already defined - -gprofng/ChangeLog -2023-02-16 Vladimir Mezentsev <vladimir.mezentsev@oracle.com> - - PR gprofng/30036 - * libcollector/iotrace.c: Define creat64 and pwrite64 only when - __USE_LARGEFILE64 and __USE_FILE_OFFSET64 are not defined. - * libcollector/mmaptrace.c: Likewise for mmap64. - -Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=f6f19a39ecfe962cb8a05522c27f513308687a74] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - gprofng/libcollector/iotrace.c | 15 ++++++++------- - gprofng/libcollector/mmaptrace.c | 2 +- - 2 files changed, 9 insertions(+), 8 deletions(-) - -diff --git a/gprofng/libcollector/iotrace.c b/gprofng/libcollector/iotrace.c -index af90cc31f1a..d8439b02b3a 100644 ---- a/gprofng/libcollector/iotrace.c -+++ b/gprofng/libcollector/iotrace.c -@@ -1441,7 +1441,7 @@ creat (const char *path, mode_t mode) - } - - /*------------------------------------------------------------- creat64 */ --#if WSIZE(32) -+#if WSIZE(32) && !defined(__USE_LARGEFILE64) - int - creat64 (const char *path, mode_t mode) - { -@@ -2476,7 +2476,7 @@ __collector_pwrite_2_1 (int fildes, const void *buf, size_t nbyte, off_t offset) - return ret; - } - --#else -+#endif - ssize_t - pwrite (int fildes, const void *buf, size_t nbyte, off_t offset) - { -@@ -2497,11 +2497,10 @@ pwrite (int fildes, const void *buf, size_t nbyte, off_t offset) - POP_REENTRANCE (guard); - return ret; - } --#endif - - /*------------------------------------------------------------- pwrite64 */ --#if WSIZE(32) --#if !defined(__MUSL_LIBC) && ARCH(Intel) -+#if WSIZE(32) && ARCH(Intel) -+#if !defined(__MUSL_LIBC) - // map interposed symbol versions - - SYMVER_ATTRIBUTE (__collector_pwrite64_2_2, pwrite64@GLIBC_2.2) -@@ -2547,8 +2546,9 @@ __collector_pwrite64_2_1 (int fildes, const void *buf, size_t nbyte, off64_t off - POP_REENTRANCE (guard); - return ret; - } -+#endif - --#else -+#if !defined(__USE_FILE_OFFSET64) - ssize_t - pwrite64 (int fildes, const void *buf, size_t nbyte, off64_t offset) - { -@@ -2570,7 +2570,8 @@ pwrite64 (int fildes, const void *buf, size_t nbyte, off64_t offset) - return ret; - } - #endif --#endif /* SIZE(32) */ -+ -+#endif /* SIZE(32) && ARCH(Intel) */ - - /*------------------------------------------------------------- fgets */ - char* -diff --git a/gprofng/libcollector/mmaptrace.c b/gprofng/libcollector/mmaptrace.c -index 61613c21560..221b4e2d176 100644 ---- a/gprofng/libcollector/mmaptrace.c -+++ b/gprofng/libcollector/mmaptrace.c -@@ -1494,7 +1494,7 @@ mmap (void *start, size_t length, int prot, int flags, int fd, off_t offset) - } - - /*------------------------------------------------------------- mmap64 */ --#if WSIZE(32) /* mmap64 only defined for non-64-bit */ -+#if WSIZE(32) && !defined(__USE_FILE_OFFSET64) - - void * - mmap64 (void *start, size_t length, int prot, int flags, int fd, off64_t offset) --- -2.31.1 - diff --git a/poky/meta/recipes-devtools/binutils/binutils_2.40.bb b/poky/meta/recipes-devtools/binutils/binutils_2.41.bb index 4ce1b4bec2..4ce1b4bec2 100644 --- a/poky/meta/recipes-devtools/binutils/binutils_2.40.bb +++ b/poky/meta/recipes-devtools/binutils/binutils_2.41.bb diff --git a/poky/meta/recipes-devtools/bison/bison/autoconf-2.73.patch b/poky/meta/recipes-devtools/bison/bison/autoconf-2.73.patch new file mode 100644 index 0000000000..8360d3928f --- /dev/null +++ b/poky/meta/recipes-devtools/bison/bison/autoconf-2.73.patch @@ -0,0 +1,24 @@ +The gnulib largefile macro needs updating to work with autoconf 2.73. Rather +than the full code: + +https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb + +Just tweak the exiting code to work with 2.73. The next bison upgrade should +update to new gnulib + +Upstream-Status: Inappropriate +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Index: findutils-4.9.0/gl/m4/largefile.m4 +=================================================================== +--- findutils-4.9.0.orig/m4/largefile.m4 ++++ findutils-4.9.0/m4/largefile.m4 +@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], + # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: + # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, + # or configures them incorrectly in some cases. +-m4_version_prereq([2.70], [], [ ++m4_version_prereq([2.73], [], [ + + # _AC_SYS_LARGEFILE_TEST_INCLUDES + # ------------------------------- diff --git a/poky/meta/recipes-devtools/bison/bison_3.8.2.bb b/poky/meta/recipes-devtools/bison/bison_3.8.2.bb index c95f321244..da138e3587 100644 --- a/poky/meta/recipes-devtools/bison/bison_3.8.2.bb +++ b/poky/meta/recipes-devtools/bison/bison_3.8.2.bb @@ -10,6 +10,7 @@ SECTION = "devel" DEPENDS = "bison-native flex-native" SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ + file://autoconf-2.73.patch \ file://add-with-bisonlocaledir.patch \ " SRC_URI[sha256sum] = "9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2" diff --git a/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb b/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb index d93152cedd..cce2f57363 100644 --- a/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb +++ b/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb @@ -83,7 +83,6 @@ SUMMARY = "Booting sequence and CPU,I/O usage monitor" DESCRIPTION = "Monitors where the system spends its time at start, creating a graph of all processes, disk utilization, and wait time." -AUTHOR = "Wonhong Kwon <wonhong.kwon@lge.com>" HOMEPAGE = "https://github.com/mmeeks/bootchart" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=44ac4678311254db62edf8fd39cb8124" diff --git a/poky/meta/recipes-devtools/createrepo-c/createrepo-c/time64fix.patch b/poky/meta/recipes-devtools/createrepo-c/createrepo-c/time64fix.patch new file mode 100644 index 0000000000..a63801ce26 --- /dev/null +++ b/poky/meta/recipes-devtools/createrepo-c/createrepo-c/time64fix.patch @@ -0,0 +1,69 @@ +From 89e1c9415fb8438310036d5810cdb7da75ee3a7f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 26 Jul 2023 12:27:14 -0700 +Subject: [PATCH] Adjust printf formats for 64bit time_t on 32bit systems + +Fixes format specifier mismatch warnings as well while here + +e.g. +warning: format '%ld' expects argument of type 'long int', but argument 2 has type 'time_t' + +Upstream-Status: Submitted [https://github.com/rpm-software-management/createrepo_c/pull/376] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/createrepo_c.c | 4 ++-- + src/misc.c | 4 ++-- + src/xml_dump_repomd.c | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/createrepo_c.c b/src/createrepo_c.c +index 8681419..0f9048a 100644 +--- a/src/createrepo_c.c ++++ b/src/createrepo_c.c +@@ -582,9 +582,9 @@ duplicates_warning(const char *nevra, GArray *locations, CmdDupNevra option) + for (size_t i=0; i<locations->len; i++) { + struct DuplicateLocation location = g_array_index(locations, struct + DuplicateLocation, i); +- g_warning(" Sourced from location: \'%s\', build timestamp: %ld%s", ++ g_warning(" Sourced from location: \'%s\', build timestamp: %jd%s", + location.location, +- location.pkg->time_build, ++ (intmax_t) location.pkg->time_build, + location.pkg->skip_dump ? skip_reason : ""); + + } +diff --git a/src/misc.c b/src/misc.c +index 8511ca2..7866c7b 100644 +--- a/src/misc.c ++++ b/src/misc.c +@@ -1512,11 +1512,11 @@ cr_append_pid_and_datetime(const char *str, const char *suffix) + gettimeofday(&tv, NULL); + timeinfo = localtime (&(tv.tv_sec)); + strftime(datetime, 80, "%Y%m%d%H%M%S", timeinfo); +- gchar *result = g_strdup_printf("%s%jd.%s.%ld%s", ++ gchar *result = g_strdup_printf("%s%jd.%s.%jd%s", + str ? str : "", + (intmax_t) getpid(), + datetime, +- tv.tv_usec, ++ (intmax_t) tv.tv_usec, + suffix ? suffix : ""); + return result; + } +diff --git a/src/xml_dump_repomd.c b/src/xml_dump_repomd.c +index 33b0e09..9d24249 100644 +--- a/src/xml_dump_repomd.c ++++ b/src/xml_dump_repomd.c +@@ -143,7 +143,7 @@ cr_xml_dump_repomd_body(xmlNodePtr root, cr_Repomd *repomd) + BAD_CAST repomd->revision); + } else { + // Use the current time if no revision was explicitly specified +- gchar *rev = g_strdup_printf("%ld", time(NULL)); ++ gchar *rev = g_strdup_printf("%jd", (intmax_t) time(NULL)); + xmlNewChild(root, NULL, BAD_CAST "revision", BAD_CAST rev); + g_free(rev); + } +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.21.1.bb b/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.21.1.bb index 5080131dc1..57f23b8dfd 100644 --- a/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.21.1.bb +++ b/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.21.1.bb @@ -8,6 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;p file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0001-include-rpm-rpmstring.h.patch \ file://0001-src-cmd_parser.c-add-a-missing-parameter-name.patch \ + file://time64fix.patch \ " SRCREV = "0652d7303ce236e596c83c29ccc9bee7868fce6e" diff --git a/poky/meta/recipes-devtools/file/file_5.44.bb b/poky/meta/recipes-devtools/file/file_5.44.bb index 3090d346ed..3ce266475b 100644 --- a/poky/meta/recipes-devtools/file/file_5.44.bb +++ b/poky/meta/recipes-devtools/file/file_5.44.bb @@ -45,9 +45,10 @@ do_install:append:class-native() { } do_install:append:class-nativesdk() { + create_wrapper ${D}/${bindir}/file MAGIC=${datadir}/misc/magic.mgc mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d cat <<- EOF > ${D}${SDKPATHNATIVE}/environment-setup.d/file.sh - export MAGIC="$OECORE_NATIVE_SYSROOT${datadir}/misc/magic.mgc" + export MAGIC="${datadir}/misc/magic.mgc" EOF } diff --git a/poky/meta/recipes-devtools/gcc/gcc-13.1.inc b/poky/meta/recipes-devtools/gcc/gcc-13.2.inc index e94753eed0..7329562f65 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-13.1.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-13.2.inc @@ -2,11 +2,11 @@ require gcc-common.inc # Third digit in PV should be incremented after a minor release -PV = "13.1.1" +PV = "13.2.0" # BINV should be incremented to a revision after a minor gcc release -BINV = "13.1.1" +BINV = "13.2.0" FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:" @@ -30,14 +30,14 @@ LIC_FILES_CHKSUM = "\ #SOURCEDIR ?= "official-gcc-${@'${RELEASE}'[0:7]}" # from snapshot -RELEASE ?= "13-20230520" -SOURCEDIR ?= "gcc-${RELEASE}" -BASEURI ?= "https://gcc.gnu.org/pub/gcc/snapshots/${RELEASE}/gcc-${RELEASE}.tar.xz" +#RELEASE ?= "13-20230520" +#SOURCEDIR ?= "gcc-${RELEASE}" +#BASEURI ?= "https://gcc.gnu.org/pub/gcc/snapshots/${RELEASE}/gcc-${RELEASE}.tar.xz" # official release -#RELEASE ?= "${PV}" -#BASEURI ?= "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.xz" -#SOURCEDIR ?= "gcc-${PV}" +RELEASE ?= "${PV}" +BASEURI ?= "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.xz" +SOURCEDIR ?= "gcc-${PV}" SRC_URI = "${BASEURI} \ file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \ @@ -65,7 +65,7 @@ SRC_URI = "${BASEURI} \ file://0023-Fix-install-path-of-linux64.h.patch \ file://0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch \ " -SRC_URI[sha256sum] = "b8716f92e468086fca5aea8873f7405f1cd7d309ad0719f0a90c57b3483e448c" +SRC_URI[sha256sum] = "e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da" S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}" B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" diff --git a/poky/meta/recipes-devtools/gcc/gcc-cross-canadian_13.1.bb b/poky/meta/recipes-devtools/gcc/gcc-cross-canadian_13.2.bb index bf53c5cd78..bf53c5cd78 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-cross-canadian_13.1.bb +++ b/poky/meta/recipes-devtools/gcc/gcc-cross-canadian_13.2.bb diff --git a/poky/meta/recipes-devtools/gcc/gcc-cross_13.1.bb b/poky/meta/recipes-devtools/gcc/gcc-cross_13.2.bb index b43cca0c52..b43cca0c52 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-cross_13.1.bb +++ b/poky/meta/recipes-devtools/gcc/gcc-cross_13.2.bb diff --git a/poky/meta/recipes-devtools/gcc/gcc-crosssdk.inc b/poky/meta/recipes-devtools/gcc/gcc-crosssdk.inc index bd65b1fed2..7eaad2314c 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-crosssdk.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-crosssdk.inc @@ -10,3 +10,5 @@ GCCMULTILIB = "--disable-multilib" DEPENDS = "virtual/${TARGET_PREFIX}binutils gettext-native ${NATIVEDEPS}" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" + +gcc_multilib_setup[vardepsexclude] = "MULTILIB_VARIANTS" diff --git a/poky/meta/recipes-devtools/gcc/gcc-crosssdk_13.1.bb b/poky/meta/recipes-devtools/gcc/gcc-crosssdk_13.2.bb index 40a6c4feff..40a6c4feff 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-crosssdk_13.1.bb +++ b/poky/meta/recipes-devtools/gcc/gcc-crosssdk_13.2.bb diff --git a/poky/meta/recipes-devtools/gcc/gcc-runtime_13.1.bb b/poky/meta/recipes-devtools/gcc/gcc-runtime_13.2.bb index dd430b57eb..dd430b57eb 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-runtime_13.1.bb +++ b/poky/meta/recipes-devtools/gcc/gcc-runtime_13.2.bb diff --git a/poky/meta/recipes-devtools/gcc/gcc-sanitizers_13.1.bb b/poky/meta/recipes-devtools/gcc/gcc-sanitizers_13.2.bb index 8bda2ccad6..8bda2ccad6 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-sanitizers_13.1.bb +++ b/poky/meta/recipes-devtools/gcc/gcc-sanitizers_13.2.bb diff --git a/poky/meta/recipes-devtools/gcc/gcc-source_13.1.bb b/poky/meta/recipes-devtools/gcc/gcc-source_13.2.bb index b890fa33ea..b890fa33ea 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-source_13.1.bb +++ b/poky/meta/recipes-devtools/gcc/gcc-source_13.2.bb diff --git a/poky/meta/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/poky/meta/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch index 0f1340491f..5c75698eda 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch @@ -1,4 +1,4 @@ -From 3875ab692a7d7ee796a6d5d2ece6daa3db81d5c4 Mon Sep 17 00:00:00 2001 +From 553564bdcabdcc5d4cc4de73c7eb94c505ef51f5 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 29 Mar 2013 08:37:11 +0400 Subject: [PATCH] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET @@ -12,10 +12,10 @@ Upstream-Status: Inappropriate [embedded specific] 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 85883099410..044315af1da 100755 +index 117a7ef23f2..535265253fd 100755 --- a/configure +++ b/configure -@@ -10183,7 +10183,7 @@ fi +@@ -10195,7 +10195,7 @@ fi # for target_alias and gcc doesn't manage it consistently. target_configargs="--cache-file=./config.cache ${target_configargs}" @@ -25,10 +25,10 @@ index 85883099410..044315af1da 100755 *" newlib "*) case " $target_configargs " in diff --git a/configure.ac b/configure.ac -index 2b612dce6e9..f26fffd4f62 100644 +index b3e9bbd2aa5..5ac8d6490f6 100644 --- a/configure.ac +++ b/configure.ac -@@ -3339,7 +3339,7 @@ fi +@@ -3351,7 +3351,7 @@ fi # for target_alias and gcc doesn't manage it consistently. target_configargs="--cache-file=./config.cache ${target_configargs}" diff --git a/poky/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch b/poky/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch index 6fa5494efc..492300047d 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch @@ -1,4 +1,4 @@ -From e09aa9c3565585390328dd514cc286c20b74e76a Mon Sep 17 00:00:00 2001 +From 52676b5934ba127c3af39fc484c8236c8fa60b96 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 8 Mar 2021 16:04:20 -0800 Subject: [PATCH] gcc: poison-system-directories @@ -11,7 +11,7 @@ aborted. Instead, we add the two missing items to the current scan. If the user wants this to be a failure, they can add "-Werror=poison-system-directories". -Upstream-Status: Pending +Upstream-Status: Inappropriate [OE configuration] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> --- @@ -132,7 +132,7 @@ index 09082e8ccae..6cd01a8966b 100644 AC_SUBST(subdirs) AC_SUBST(srcdir) diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index c9482886c5a..f302c637908 100644 +index de40f62e219..d6f203c8b71 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}. @@ -143,7 +143,7 @@ index c9482886c5a..f302c637908 100644 -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls -Wrestrict -Wno-return-local-addr -Wreturn-type -Wno-scalar-storage-order -Wsequence-point -@@ -8422,6 +8423,14 @@ made up of data only and thus requires no special treatment. But, for +@@ -8426,6 +8427,14 @@ made up of data only and thus requires no special treatment. But, for most targets, it is made up of code and thus requires the stack to be made executable in order for the program to work properly. diff --git a/poky/meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch b/poky/meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch index d547d7e48a..3b3eec2027 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch @@ -1,4 +1,4 @@ -From 86664e09670efa5a8662ef59590e01707f8e0cc3 Mon Sep 17 00:00:00 2001 +From febfac59d0e8a864370d0b4018b4e497ceec156d Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 29 Mar 2013 09:10:06 +0400 Subject: [PATCH] 64-bit multilib hack diff --git a/poky/meta/recipes-devtools/gcc/gcc/0004-Pass-CXXFLAGS_FOR_BUILD-in-a-couple-of-places-to-avo.patch b/poky/meta/recipes-devtools/gcc/gcc/0004-Pass-CXXFLAGS_FOR_BUILD-in-a-couple-of-places-to-avo.patch index d749ff12d4..7e33bf17b0 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0004-Pass-CXXFLAGS_FOR_BUILD-in-a-couple-of-places-to-avo.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0004-Pass-CXXFLAGS_FOR_BUILD-in-a-couple-of-places-to-avo.patch @@ -1,4 +1,4 @@ -From 2a1336d2e2ba08747acd7368264fc5813a37b049 Mon Sep 17 00:00:00 2001 +From 6fbf920ccde6efc2d0caafde996d9e5738a1ba37 Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Thu, 28 Oct 2021 11:33:40 +0100 Subject: [PATCH] Pass CXXFLAGS_FOR_BUILD in a couple of places to avoid these @@ -13,7 +13,7 @@ ChangeLog: * Makefile.in: Regenerate. * Makefile.tpl: Add missing CXXFLAGS_FOR_BUILD overrides -Upstream-Status: Pending [should be submittable] +Upstream-Status: Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2023-February/612560.html] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Khem Raj <raj.khem@gmail.com> diff --git a/poky/meta/recipes-devtools/gcc/gcc/0005-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/poky/meta/recipes-devtools/gcc/gcc/0005-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch index 2eba38e375..db2fea3d16 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0005-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0005-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch @@ -1,4 +1,4 @@ -From 6cce395992a1b573e6795fdad2f9086db921e924 Mon Sep 17 00:00:00 2001 +From 2cedf13819c0cc929660072d8a972f5e422f9701 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 29 Mar 2013 09:17:25 +0400 Subject: [PATCH] Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B} @@ -26,7 +26,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index ad9a5d94cd0..fe636af3f63 100644 +index 775aaa1b3c4..04f28984b34 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -561,7 +561,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ diff --git a/poky/meta/recipes-devtools/gcc/gcc/0006-cpp-honor-sysroot.patch b/poky/meta/recipes-devtools/gcc/gcc/0006-cpp-honor-sysroot.patch index 3887aa3a05..704c44cb72 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0006-cpp-honor-sysroot.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0006-cpp-honor-sysroot.patch @@ -1,4 +1,4 @@ -From 223ff12852a8c8974f6e542ee3a8b276639d2452 Mon Sep 17 00:00:00 2001 +From f0b4d02a3a3dca1d67fd7add15ed63c2cd572bb9 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 29 Mar 2013 09:22:00 +0400 Subject: [PATCH] cpp: honor sysroot. @@ -17,7 +17,7 @@ The fix below adds %I to the cpp-output spec macro so the default substitutions RP 2012/04/13 -Upstream-Status: Pending +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- diff --git a/poky/meta/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/poky/meta/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch index e3af0bf161..079142c540 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch @@ -1,4 +1,4 @@ -From ba2e308f7993099708ef3d8cbf2db5f134f08941 Mon Sep 17 00:00:00 2001 +From aacfd6e14dd583b1fdc65691def61c5e1bc89708 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 29 Mar 2013 09:24:50 +0400 Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER @@ -35,6 +35,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> gcc/config/sparc/linux64.h | 4 ++-- 18 files changed, 53 insertions(+), 58 deletions(-) +diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h +index 4277f03da2a..e4c92c03291 100644 --- a/gcc/config/aarch64/aarch64-linux.h +++ b/gcc/config/aarch64/aarch64-linux.h @@ -21,10 +21,10 @@ @@ -50,9 +52,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #undef ASAN_CC1_SPEC #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" +diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h +index 03f783f2ad1..4fa02668aa7 100644 --- a/gcc/config/alpha/linux-elf.h +++ b/gcc/config/alpha/linux-elf.h -@@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. +@@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see #define EXTRA_SPECS \ { "elf_dynamic_linker", ELF_DYNAMIC_LINKER }, @@ -63,6 +67,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #if DEFAULT_LIBC == LIBC_UCLIBC #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" #elif DEFAULT_LIBC == LIBC_GLIBC +diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h +index a119875599d..dce7f59eeea 100644 --- a/gcc/config/arm/linux-eabi.h +++ b/gcc/config/arm/linux-eabi.h @@ -62,8 +62,8 @@ @@ -85,6 +91,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to use the GNU/Linux version, not the generic BPABI version. */ +diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h +index 7b7b7cbbe14..98ef2267117 100644 --- a/gcc/config/arm/linux-elf.h +++ b/gcc/config/arm/linux-elf.h @@ -60,7 +60,7 @@ @@ -96,9 +104,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #define LINUX_TARGET_LINK_SPEC "%{h*} \ %{static:-Bstatic} \ +diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h +index bbb7cc7115e..7d9272040ee 100644 --- a/gcc/config/i386/linux.h +++ b/gcc/config/i386/linux.h -@@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. +@@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see <http://www.gnu.org/licenses/>. */ #define GNU_USER_LINK_EMULATION "elf_i386" @@ -108,9 +118,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #undef MUSL_DYNAMIC_LINKER -#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" +#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-i386.so.1" +diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h +index 2bd9f48e271..dbbe7ca5440 100644 --- a/gcc/config/i386/linux64.h +++ b/gcc/config/i386/linux64.h -@@ -27,13 +27,13 @@ see the files COPYING3 and COPYING.RUNTI +@@ -27,13 +27,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define GNU_USER_LINK_EMULATION64 "elf_x86_64" #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" @@ -130,9 +142,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #undef MUSL_DYNAMIC_LINKERX32 -#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" +#define MUSL_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-musl-x32.so.1" +diff --git a/gcc/config/linux.h b/gcc/config/linux.h +index e3aca79cccc..6491c6b84f5 100644 --- a/gcc/config/linux.h +++ b/gcc/config/linux.h -@@ -86,10 +86,10 @@ see the files COPYING3 and COPYING.RUNTI +@@ -86,10 +86,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see GLIBC_DYNAMIC_LINKER must be defined for each target using them, or GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets supporting both 32-bit and 64-bit compilation. */ @@ -147,9 +161,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #define BIONIC_DYNAMIC_LINKER "/system/bin/linker" #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" +diff --git a/gcc/config/loongarch/gnu-user.h b/gcc/config/loongarch/gnu-user.h +index aecaa02a199..62f88f7f9a2 100644 --- a/gcc/config/loongarch/gnu-user.h +++ b/gcc/config/loongarch/gnu-user.h -@@ -31,11 +31,11 @@ along with GCC; see the file COPYING3. +@@ -31,11 +31,11 @@ along with GCC; see the file COPYING3. If not see #undef GLIBC_DYNAMIC_LINKER #define GLIBC_DYNAMIC_LINKER \ @@ -163,6 +179,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #undef GNU_USER_TARGET_LINK_SPEC #define GNU_USER_TARGET_LINK_SPEC \ +diff --git a/gcc/config/microblaze/linux.h b/gcc/config/microblaze/linux.h +index e2e2c421c52..6f26480e3b5 100644 --- a/gcc/config/microblaze/linux.h +++ b/gcc/config/microblaze/linux.h @@ -28,7 +28,7 @@ @@ -183,9 +201,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ +diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h +index 5add34ea134..34692b433b8 100644 --- a/gcc/config/mips/linux.h +++ b/gcc/config/mips/linux.h -@@ -22,29 +22,29 @@ along with GCC; see the file COPYING3. +@@ -22,29 +22,29 @@ along with GCC; see the file COPYING3. If not see #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" #define GLIBC_DYNAMIC_LINKER32 \ @@ -224,6 +244,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" #define GNU_USER_DYNAMIC_LINKERN32 \ +diff --git a/gcc/config/nios2/linux.h b/gcc/config/nios2/linux.h +index 2ce097ebbce..1d45d7b4962 100644 --- a/gcc/config/nios2/linux.h +++ b/gcc/config/nios2/linux.h @@ -29,10 +29,10 @@ @@ -239,9 +261,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #undef LINK_SPEC #define LINK_SPEC LINK_SPEC_ENDIAN \ +diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h +index 3e625e0f867..dc3afc97e27 100644 --- a/gcc/config/riscv/linux.h +++ b/gcc/config/riscv/linux.h -@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. +@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see GNU_USER_TARGET_OS_CPP_BUILTINS(); \ } while (0) @@ -250,7 +274,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #define MUSL_ABI_SUFFIX \ "%{mabi=ilp32:-sf}" \ -@@ -33,7 +33,7 @@ along with GCC; see the file COPYING3. +@@ -33,7 +33,7 @@ along with GCC; see the file COPYING3. If not see "%{mabi=lp64d:}" #undef MUSL_DYNAMIC_LINKER @@ -259,6 +283,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #define ICACHE_FLUSH_FUNC "__riscv_flush_icache" +diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h +index 9e457033d11..2ddab7c99c1 100644 --- a/gcc/config/rs6000/linux64.h +++ b/gcc/config/rs6000/linux64.h @@ -339,24 +339,19 @@ extern int dot_symbols; @@ -291,6 +317,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #undef DEFAULT_ASM_ENDIAN #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) +diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h +index ae932fc22f0..26db003cb3a 100644 --- a/gcc/config/rs6000/sysv4.h +++ b/gcc/config/rs6000/sysv4.h @@ -771,10 +771,10 @@ GNU_USER_TARGET_CC1_SPEC @@ -306,9 +334,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #ifndef GNU_USER_DYNAMIC_LINKER #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER +diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h +index 02aa1edaff8..fab268d61f4 100644 --- a/gcc/config/s390/linux.h +++ b/gcc/config/s390/linux.h -@@ -72,13 +72,13 @@ along with GCC; see the file COPYING3. +@@ -72,13 +72,13 @@ along with GCC; see the file COPYING3. If not see #define MULTILIB_DEFAULTS { "m31" } #endif @@ -326,9 +356,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #undef LINK_SPEC #define LINK_SPEC \ +diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h +index 29f5902b98b..83d1e53e6e2 100644 --- a/gcc/config/sh/linux.h +++ b/gcc/config/sh/linux.h -@@ -61,10 +61,10 @@ along with GCC; see the file COPYING3. +@@ -61,10 +61,10 @@ along with GCC; see the file COPYING3. If not see #undef MUSL_DYNAMIC_LINKER #define MUSL_DYNAMIC_LINKER \ @@ -341,9 +373,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #undef SUBTARGET_LINK_EMUL_SUFFIX #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}" +diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h +index 0e33b3cac2c..84f29adbb35 100644 --- a/gcc/config/sparc/linux.h +++ b/gcc/config/sparc/linux.h -@@ -78,7 +78,7 @@ extern const char *host_detect_local_cpu +@@ -78,7 +78,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); When the -shared link option is used a final link is not being done. */ @@ -352,9 +386,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #undef LINK_SPEC #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ +diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h +index f1cc0a19e49..94bc2032803 100644 --- a/gcc/config/sparc/linux64.h +++ b/gcc/config/sparc/linux64.h -@@ -78,8 +78,8 @@ along with GCC; see the file COPYING3. +@@ -78,8 +78,8 @@ along with GCC; see the file COPYING3. If not see When the -shared link option is used a final link is not being done. */ diff --git a/poky/meta/recipes-devtools/gcc/gcc/0008-libtool.patch b/poky/meta/recipes-devtools/gcc/gcc/0008-libtool.patch index 72248e64b1..5b44dc809e 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0008-libtool.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0008-libtool.patch @@ -1,4 +1,4 @@ -From 5ce9e36a87974ce5c1c1adb6e4390350233d8770 Mon Sep 17 00:00:00 2001 +From 7608e93ab97e8c33e3b14323d0cabc651926e403 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 29 Mar 2013 09:29:11 +0400 Subject: [PATCH] libtool diff --git a/poky/meta/recipes-devtools/gcc/gcc/0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/poky/meta/recipes-devtools/gcc/gcc/0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch index 871a634d14..86542bd146 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch @@ -1,4 +1,4 @@ -From 37c7471aa476dfc591a7123e39e38ef8b049f5c0 Mon Sep 17 00:00:00 2001 +From 4b0efc18e0d91967a3db11d9ef0595a5a76ad67a Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 29 Mar 2013 09:30:32 +0400 Subject: [PATCH] gcc: armv4: pass fix-v4bx to linker to support EABI. diff --git a/poky/meta/recipes-devtools/gcc/gcc/0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/poky/meta/recipes-devtools/gcc/gcc/0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch index a88abc2fad..bc3943087c 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch @@ -1,4 +1,4 @@ -From 2be15956b4051680aa8da9df97ef032ac8616fb1 Mon Sep 17 00:00:00 2001 +From b015460586e2ea8a35a11d1a607728707bdf6509 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 29 Mar 2013 09:33:04 +0400 Subject: [PATCH] Use the multilib config files from ${B} instead of using the diff --git a/poky/meta/recipes-devtools/gcc/gcc/0011-aarch64-Fix-include-paths-when-S-B.patch b/poky/meta/recipes-devtools/gcc/gcc/0011-aarch64-Fix-include-paths-when-S-B.patch index f52e21edc2..974aca5ee4 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0011-aarch64-Fix-include-paths-when-S-B.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0011-aarch64-Fix-include-paths-when-S-B.patch @@ -1,4 +1,4 @@ -From 710d1325474e708e6b34eebe09f3f130420af293 Mon Sep 17 00:00:00 2001 +From b7ce05b2d969b311c6061bda32c3117c76bf7e0c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 31 Jan 2023 22:03:38 -0800 Subject: [PATCH] aarch64: Fix include paths when S != B @@ -28,7 +28,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h -index 155cace6afe..07d68958908 100644 +index 73b09e20508..10ea3672f20 100644 --- a/gcc/config/aarch64/aarch64.h +++ b/gcc/config/aarch64/aarch64.h @@ -161,8 +161,8 @@ diff --git a/poky/meta/recipes-devtools/gcc/gcc/0012-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/poky/meta/recipes-devtools/gcc/gcc/0012-Avoid-using-libdir-from-.la-which-usually-points-to-.patch index b05be59c72..cf5efcd32d 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0012-Avoid-using-libdir-from-.la-which-usually-points-to-.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0012-Avoid-using-libdir-from-.la-which-usually-points-to-.patch @@ -1,4 +1,4 @@ -From e8e8a0ab572cfceb9758f99599c0db4c962e49c0 Mon Sep 17 00:00:00 2001 +From 39ab6fe76f2788b2c989d29c9016f1fe53cb736e Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 20 Feb 2015 09:39:38 +0000 Subject: [PATCH] Avoid using libdir from .la which usually points to a host diff --git a/poky/meta/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch b/poky/meta/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch index b9a3f05df8..e2343a3c17 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch @@ -1,4 +1,4 @@ -From 93ad7cf3ff92771451c2994cab45e34a0c8574a0 Mon Sep 17 00:00:00 2001 +From 531b9df680c4380797e8e7705a8e7f8ed17ebe68 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 20 Feb 2015 10:25:11 +0000 Subject: [PATCH] Ensure target gcc headers can be included @@ -13,7 +13,7 @@ command line in order to resolve this. Extend target gcc headers search to musl too -Upstream-Status: Pending +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> @@ -25,7 +25,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 4 files changed, 22 insertions(+) diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index fe636af3f63..065ce7e9a5b 100644 +index 04f28984b34..8ef996c0f4d 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -640,6 +640,7 @@ libexecdir = @libexecdir@ diff --git a/poky/meta/recipes-devtools/gcc/gcc/0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/poky/meta/recipes-devtools/gcc/gcc/0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch index 5de0e3e982..30224d7485 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch @@ -1,4 +1,4 @@ -From e0775b77b8d10066e27ab89d15441b39024a29fd Mon Sep 17 00:00:00 2001 +From 793201cebfeb129f6f263e64310b30a0ffa48895 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 3 Mar 2015 08:21:19 +0000 Subject: [PATCH] Don't search host directory during "relink" if $inst_prefix diff --git a/poky/meta/recipes-devtools/gcc/gcc/0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/poky/meta/recipes-devtools/gcc/gcc/0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch index f1eee4a833..33c601ac97 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch @@ -1,4 +1,4 @@ -From 7776c630e2560bacff7d1e9b04e7916ed4c05d00 Mon Sep 17 00:00:00 2001 +From 5de63874335c1c673dd132f6aca00dc13f1eac51 Mon Sep 17 00:00:00 2001 From: Robert Yang <liezhi.yang@windriver.com> Date: Sun, 5 Jul 2015 20:25:18 -0700 Subject: [PATCH] libcc1: fix libcc1's install path and rpath diff --git a/poky/meta/recipes-devtools/gcc/gcc/0016-handle-sysroot-support-for-nativesdk-gcc.patch b/poky/meta/recipes-devtools/gcc/gcc/0016-handle-sysroot-support-for-nativesdk-gcc.patch index e05fd4e6a2..bdffcae7dc 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0016-handle-sysroot-support-for-nativesdk-gcc.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0016-handle-sysroot-support-for-nativesdk-gcc.patch @@ -1,4 +1,4 @@ -From 4f9c952ad5fa68260d6a40570b0fdb7359c85057 Mon Sep 17 00:00:00 2001 +From bbc75b93bff66891fa7ffb3af5c6ad53df1fff68 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 7 Dec 2015 23:39:54 +0000 Subject: [PATCH] handle sysroot support for nativesdk-gcc diff --git a/poky/meta/recipes-devtools/gcc/gcc/0017-Search-target-sysroot-gcc-version-specific-dirs-with.patch b/poky/meta/recipes-devtools/gcc/gcc/0017-Search-target-sysroot-gcc-version-specific-dirs-with.patch index d0aeeb2769..8a11049ca3 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0017-Search-target-sysroot-gcc-version-specific-dirs-with.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0017-Search-target-sysroot-gcc-version-specific-dirs-with.patch @@ -1,7 +1,8 @@ -From 0058f8a2233d9e96e39d09f4d994da3c96f9e030 Mon Sep 17 00:00:00 2001 +From 7e095089452b6e895ec40981752e9f902f0ad889 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 7 Dec 2015 23:41:45 +0000 -Subject: [PATCH] Search target sysroot gcc version specific dirs with multilib. +Subject: [PATCH] Search target sysroot gcc version specific dirs with + multilib. We install the gcc libraries (such as crtbegin.p) into <sysroot><libdir>/<target-sys>/5.2.0/ diff --git a/poky/meta/recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/poky/meta/recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch index 9545e76b05..9bc77b485f 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch @@ -1,4 +1,4 @@ -From 0a194b74f0f171b46527ff447c27fbf32406333d Mon Sep 17 00:00:00 2001 +From bf92b290556b7050df0a001cc7ae43cf79990456 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 27 Jun 2017 18:10:54 -0700 Subject: [PATCH] Add ssp_nonshared to link commandline for musl targets @@ -13,7 +13,7 @@ are already present in libc_nonshared library therefore we do not need any library helper on glibc based systems but musl needs the libssp_noshared from gcc -Upstream-Status: Pending +Upstream-Status: Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2023-April/615317.html] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- diff --git a/poky/meta/recipes-devtools/gcc/gcc/0019-Re-introduce-spe-commandline-options.patch b/poky/meta/recipes-devtools/gcc/gcc/0019-Re-introduce-spe-commandline-options.patch index 409dff3b7e..f785688661 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0019-Re-introduce-spe-commandline-options.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0019-Re-introduce-spe-commandline-options.patch @@ -1,4 +1,4 @@ -From 0b83874fd8e767248adffd616bcd07aa438b6905 Mon Sep 17 00:00:00 2001 +From 587ac4a59ea56da18a9989c31a75124e974cb37c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 6 Jun 2018 12:10:22 -0700 Subject: [PATCH] Re-introduce spe commandline options diff --git a/poky/meta/recipes-devtools/gcc/gcc/0020-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch b/poky/meta/recipes-devtools/gcc/gcc/0020-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch index 205fdb66c9..b86edab5d5 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0020-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0020-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch @@ -1,4 +1,4 @@ -From d8b6f60d1206a67c640096bac3b348828914163c Mon Sep 17 00:00:00 2001 +From 8c4c59521720f8c1b1e38e38896b47fcb1bf00ac Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy <nsz@port70.net> Date: Sat, 24 Oct 2015 20:09:53 +0000 Subject: [PATCH] libgcc_s: Use alias for __cpu_indicator_init instead of @@ -29,7 +29,7 @@ gcc/Changelog: * config/i386/i386-expand.c (ix86_expand_builtin): Make __builtin_cpu_init call __cpu_indicator_init_local instead of __cpu_indicator_init. -Upstream-Status: Pending +Upstream-Status: Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2023-February/612559.html] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- diff --git a/poky/meta/recipes-devtools/gcc/gcc/0021-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch b/poky/meta/recipes-devtools/gcc/gcc/0021-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch index 43df7fcb71..b6707592dc 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0021-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0021-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch @@ -1,4 +1,4 @@ -From 18f400d6c91b800361af633b6b93a9e5881bbb0f Mon Sep 17 00:00:00 2001 +From f15b19d8e058c983c49c4566c1879fdaf5b1ab54 Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Tue, 10 Mar 2020 08:26:53 -0700 Subject: [PATCH] gentypes/genmodes: Do not use __LINE__ for maintaining diff --git a/poky/meta/recipes-devtools/gcc/gcc/0022-libatomic-Do-not-enforce-march-on-aarch64.patch b/poky/meta/recipes-devtools/gcc/gcc/0022-libatomic-Do-not-enforce-march-on-aarch64.patch index cb8969b193..0ea8aac543 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0022-libatomic-Do-not-enforce-march-on-aarch64.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0022-libatomic-Do-not-enforce-march-on-aarch64.patch @@ -1,4 +1,4 @@ -From c3870d073eb9e5d82f9d3067d0fa15038b69713a Mon Sep 17 00:00:00 2001 +From 939a899b862f7a25e52b74d1587fc75fc65779c0 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 13 May 2020 15:10:38 -0700 Subject: [PATCH] libatomic: Do not enforce march on aarch64 diff --git a/poky/meta/recipes-devtools/gcc/gcc/0023-Fix-install-path-of-linux64.h.patch b/poky/meta/recipes-devtools/gcc/gcc/0023-Fix-install-path-of-linux64.h.patch index 11f42c59c4..cd962d82bd 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0023-Fix-install-path-of-linux64.h.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0023-Fix-install-path-of-linux64.h.patch @@ -1,4 +1,4 @@ -From 7bd6e631e4a5273f5ecc41a5a48830a1342e5926 Mon Sep 17 00:00:00 2001 +From 696d696381dd99ec2bddb1170f96f98da36eb418 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <andrei.gherzan@huawei.com> Date: Wed, 22 Dec 2021 12:49:25 +0100 Subject: [PATCH] Fix install path of linux64.h @@ -17,10 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 2 insertions(+) diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 065ce7e9a5b..d4c723968aa 100644 +index 8ef996c0f4d..21daf380e34 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in -@@ -3738,6 +3738,8 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype +@@ -3731,6 +3731,8 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype "$(srcdir)"/config/* | "$(srcdir)"/common/config/* \ | "$(srcdir)"/c-family/* | "$(srcdir)"/*.def ) \ base=`echo "$$path" | sed -e "s|$$srcdirstrip/||"`;; \ diff --git a/poky/meta/recipes-devtools/gcc/gcc/0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch b/poky/meta/recipes-devtools/gcc/gcc/0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch index ad8269016f..04d940ae0b 100644 --- a/poky/meta/recipes-devtools/gcc/gcc/0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch +++ b/poky/meta/recipes-devtools/gcc/gcc/0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch @@ -1,4 +1,4 @@ -From 4623d87d779853a2862ee92a15a41fded81eddb8 Mon Sep 17 00:00:00 2001 +From 9487b1d6136ea09cce4792d59d0170c712575550 Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Sat, 20 Aug 2022 09:04:14 -0700 Subject: [PATCH] Avoid hardcoded build paths into ppc libgcc diff --git a/poky/meta/recipes-devtools/gcc/gcc_13.1.bb b/poky/meta/recipes-devtools/gcc/gcc_13.2.bb index 255fe552bd..255fe552bd 100644 --- a/poky/meta/recipes-devtools/gcc/gcc_13.1.bb +++ b/poky/meta/recipes-devtools/gcc/gcc_13.2.bb diff --git a/poky/meta/recipes-devtools/gcc/libgcc-initial_13.1.bb b/poky/meta/recipes-devtools/gcc/libgcc-initial_13.2.bb index a259082b47..a259082b47 100644 --- a/poky/meta/recipes-devtools/gcc/libgcc-initial_13.1.bb +++ b/poky/meta/recipes-devtools/gcc/libgcc-initial_13.2.bb diff --git a/poky/meta/recipes-devtools/gcc/libgcc_13.1.bb b/poky/meta/recipes-devtools/gcc/libgcc_13.2.bb index fdcd6cc0da..fdcd6cc0da 100644 --- a/poky/meta/recipes-devtools/gcc/libgcc_13.1.bb +++ b/poky/meta/recipes-devtools/gcc/libgcc_13.2.bb diff --git a/poky/meta/recipes-devtools/gcc/libgfortran_13.1.bb b/poky/meta/recipes-devtools/gcc/libgfortran_13.2.bb index 71dd8b4bdc..71dd8b4bdc 100644 --- a/poky/meta/recipes-devtools/gcc/libgfortran_13.1.bb +++ b/poky/meta/recipes-devtools/gcc/libgfortran_13.2.bb diff --git a/poky/meta/recipes-devtools/git/git_2.39.3.bb b/poky/meta/recipes-devtools/git/git_2.41.0.bb index 3393550c85..b84be24b94 100644 --- a/poky/meta/recipes-devtools/git/git_2.39.3.bb +++ b/poky/meta/recipes-devtools/git/git_2.41.0.bb @@ -117,7 +117,6 @@ FILES:${PN} += "${datadir}/git-core ${libexecdir}/git-core/" PERLTOOLS = " \ ${bindir}/git-cvsserver \ - ${libexecdir}/git-core/git-add--interactive \ ${libexecdir}/git-core/git-archimport \ ${libexecdir}/git-core/git-cvsexportcommit \ ${libexecdir}/git-core/git-cvsimport \ @@ -161,4 +160,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "2f9aa93c548941cc5aff641cedc24add15b912ad8c9b36ff5a41b1a9dcad783e" +SRC_URI[tarball.sha256sum] = "c4a6a3dd1827895a80cbd824e14d94811796ae54037549e0da93f7b84cb45b9f" diff --git a/poky/meta/recipes-devtools/go/go-1.20.6.inc b/poky/meta/recipes-devtools/go/go-1.20.7.inc index 551171b255..f7974367cc 100644 --- a/poky/meta/recipes-devtools/go/go-1.20.6.inc +++ b/poky/meta/recipes-devtools/go/go-1.20.7.inc @@ -15,4 +15,4 @@ SRC_URI += "\ file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ " -SRC_URI[main.sha256sum] = "62ee5bc6fb55b8bae8f705e0cb8df86d6453626b4ecf93279e2867092e0b7f70" +SRC_URI[main.sha256sum] = "2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597" diff --git a/poky/meta/recipes-devtools/go/go-binary-native_1.20.6.bb b/poky/meta/recipes-devtools/go/go-binary-native_1.20.7.bb index 5b2f8f4352..3decde1954 100644 --- a/poky/meta/recipes-devtools/go/go-binary-native_1.20.6.bb +++ b/poky/meta/recipes-devtools/go/go-binary-native_1.20.7.bb @@ -9,9 +9,9 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "b945ae2bb5db01a0fb4786afde64e6fbab50b67f6fa0eb6cfa4924f16a7ff1eb" -SRC_URI[go_linux_arm64.sha256sum] = "4e15ab37556e979181a1a1cc60f6d796932223a0f5351d7c83768b356f84429b" -SRC_URI[go_linux_ppc64le.sha256sum] = "a1b91a42a40bba54bfd5c96c23d72250e0c424038d0d2b5c7950b828b4905822" +SRC_URI[go_linux_amd64.sha256sum] = "f0a87f1bcae91c4b69f8dc2bc6d7e6bfcd7524fceec130af525058c0c17b1b44" +SRC_URI[go_linux_arm64.sha256sum] = "44781ae3b153c3b07651d93b6bc554e835a36e2d72a696281c1e4dad9efffe43" +SRC_URI[go_linux_ppc64le.sha256sum] = "6318a1db307c12b8afe68808bd6fae4fba1e558a85b958216096869ed506dcb3" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux" diff --git a/poky/meta/recipes-devtools/go/go-cross-canadian_1.20.6.bb b/poky/meta/recipes-devtools/go/go-cross-canadian_1.20.7.bb index 7ac9449e47..7ac9449e47 100644 --- a/poky/meta/recipes-devtools/go/go-cross-canadian_1.20.6.bb +++ b/poky/meta/recipes-devtools/go/go-cross-canadian_1.20.7.bb diff --git a/poky/meta/recipes-devtools/go/go-cross_1.20.6.bb b/poky/meta/recipes-devtools/go/go-cross_1.20.7.bb index 80b5a03f6c..80b5a03f6c 100644 --- a/poky/meta/recipes-devtools/go/go-cross_1.20.6.bb +++ b/poky/meta/recipes-devtools/go/go-cross_1.20.7.bb diff --git a/poky/meta/recipes-devtools/go/go-crosssdk_1.20.6.bb b/poky/meta/recipes-devtools/go/go-crosssdk_1.20.7.bb index 1857c8a577..1857c8a577 100644 --- a/poky/meta/recipes-devtools/go/go-crosssdk_1.20.6.bb +++ b/poky/meta/recipes-devtools/go/go-crosssdk_1.20.7.bb diff --git a/poky/meta/recipes-devtools/go/go-native_1.20.6.bb b/poky/meta/recipes-devtools/go/go-native_1.20.7.bb index ddf25b2c9b..ddf25b2c9b 100644 --- a/poky/meta/recipes-devtools/go/go-native_1.20.6.bb +++ b/poky/meta/recipes-devtools/go/go-native_1.20.7.bb diff --git a/poky/meta/recipes-devtools/go/go-runtime_1.20.6.bb b/poky/meta/recipes-devtools/go/go-runtime_1.20.7.bb index 63464a1501..63464a1501 100644 --- a/poky/meta/recipes-devtools/go/go-runtime_1.20.6.bb +++ b/poky/meta/recipes-devtools/go/go-runtime_1.20.7.bb diff --git a/poky/meta/recipes-devtools/go/go_1.20.6.bb b/poky/meta/recipes-devtools/go/go_1.20.7.bb index 46f5fbc6be..46f5fbc6be 100644 --- a/poky/meta/recipes-devtools/go/go_1.20.6.bb +++ b/poky/meta/recipes-devtools/go/go_1.20.7.bb diff --git a/poky/meta/recipes-devtools/jquery/jquery_3.6.3.bb b/poky/meta/recipes-devtools/jquery/jquery_3.7.0.bb index db4745ad7a..eceed9c9dd 100644 --- a/poky/meta/recipes-devtools/jquery/jquery_3.6.3.bb +++ b/poky/meta/recipes-devtools/jquery/jquery_3.7.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://jquery.com/" DESCRIPTION = "${SUMMARY}" LICENSE = "MIT" SECTION = "devel" -LIC_FILES_CHKSUM = "file://${S}/${BP}.js;beginline=8;endline=10;md5=9c7c6e9ab275fc1e0d99cb7180ecd14c" +LIC_FILES_CHKSUM = "file://${S}/${BP}.js;beginline=5;endline=7;md5=9c7c6e9ab275fc1e0d99cb7180ecd14c" # unpack items to ${S} so the archiver can see them # @@ -13,9 +13,9 @@ SRC_URI = "\ https://code.jquery.com/${BP}.min.map;name=map;subdir=${BP} \ " -SRC_URI[js.sha256sum] = "9d02ee01919145c20b03ee9d3013af7118793dedf5d2c0696a773af90066c953" -SRC_URI[min.sha256sum] = "a6f3f0faea4b3d48e03176341bef0ed3151ffbf226d4c6635f1c6039c0500575" -SRC_URI[map.sha256sum] = "156b740931ade6c1a98d99713eeb186f93847ffc56057e973becab4d037ed53a" +SRC_URI[js.sha256sum] = "265a924c42de4784cba8fd0e1bd77133bc833ea5f5a31fc77e08922c18fcfa43" +SRC_URI[min.sha256sum] = "d8f9afbf492e4c139e9d2bcb9ba6ef7c14921eb509fb703bc7a3f911b774eff8" +SRC_URI[map.sha256sum] = "cae47e834ee977975a48c851b165cc52ea916cc968ba7d280b1293f573cd1a48" UPSTREAM_CHECK_REGEX = "jquery-(?P<pver>\d+(\.\d+)+)\.js" diff --git a/poky/meta/recipes-devtools/patchelf/patchelf/0001-Set-interpreter-only-when-necessary.patch b/poky/meta/recipes-devtools/patchelf/patchelf/0001-Set-interpreter-only-when-necessary.patch new file mode 100644 index 0000000000..9a8216b3fe --- /dev/null +++ b/poky/meta/recipes-devtools/patchelf/patchelf/0001-Set-interpreter-only-when-necessary.patch @@ -0,0 +1,31 @@ +From f5df94952e87eaa390e5c845bc48fdb3dbc31cc2 Mon Sep 17 00:00:00 2001 +From: Yuta Hayama <hayama@lineo.co.jp> +Date: Fri, 21 Jul 2023 10:47:02 +0900 +Subject: [PATCH] Set interpreter only when necessary + +If the given interpreter is already set, nothing needs to be done. +As with modifySoname(), it skips unnecessary processing. + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- +Upstream-Status: Submitted [https://github.com/NixOS/patchelf/pull/508] + + src/patchelf.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/patchelf.cc b/src/patchelf.cc +index 86429c4..e562c49 100644 +--- a/src/patchelf.cc ++++ b/src/patchelf.cc +@@ -1460,6 +1460,11 @@ void ElfFile<ElfFileParamNames>::modifySoname(sonameMode op, const std::string & + template<ElfFileParams> + void ElfFile<ElfFileParamNames>::setInterpreter(const std::string & newInterpreter) + { ++ if (getInterpreter() == newInterpreter) { ++ debug("given interpreter is already set\n"); ++ return; ++ } ++ + std::string & section = replaceSection(".interp", newInterpreter.size() + 1); + setSubstr(section, 0, newInterpreter + '\0'); + changed = true; diff --git a/poky/meta/recipes-devtools/patchelf/patchelf/0002-align-startOffset-with-p_align-instead-of-pagesize-f.patch b/poky/meta/recipes-devtools/patchelf/patchelf/0002-align-startOffset-with-p_align-instead-of-pagesize-f.patch new file mode 100644 index 0000000000..7906f0f73b --- /dev/null +++ b/poky/meta/recipes-devtools/patchelf/patchelf/0002-align-startOffset-with-p_align-instead-of-pagesize-f.patch @@ -0,0 +1,42 @@ +From 1198329b922f3cdddc3e87a7c81d7730b646c088 Mon Sep 17 00:00:00 2001 +From: Yuta Hayama <hayama@lineo.co.jp> +Date: Fri, 28 Jul 2023 16:22:31 +0900 +Subject: [PATCH] align startOffset with p_align instead of pagesize for + compatibility + +According to the ELF specification, the alignment of loadable process segments +should satisfy (p_vaddr mod pagesize) == (p_offset mod pagesize). However, +glibc earlier than 2.35 incorrectly requires that the LOAD segment be (p_vaddr +mod p_align) == (p_offset mod p_align), and will output the error message +"ELF load command address/offset not properly aligned" if this is not met. + +Since there are many systems that use glibc earlier than 2.35, it is preferable +that newly added LOAD segments satisfy (p_vaddr mod p_align) == (p_offset mod +p_align) for compatibility. + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- +Upstream-Status: Submitted [https://github.com/NixOS/patchelf/pull/510] + + src/patchelf.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/patchelf.cc b/src/patchelf.cc +index 82b4b46..6edb81a 100644 +--- a/src/patchelf.cc ++++ b/src/patchelf.cc +@@ -843,7 +843,13 @@ void ElfFile<ElfFileParamNames>::rewriteSectionsLibrary() + neededSpace += headerTableSpace; + debug("needed space is %d\n", neededSpace); + +- Elf_Off startOffset = roundUp(fileContents->size(), getPageSize()); ++ /* glibc earlier than 2.35 requires that the LOAD segment satisfies ++ (p_vaddr mod p_align) == (p_offset mod p_align). ++ The ELF specification requires that loadable process segments satisfy ++ (p_vaddr mod pagesize) == (p_offset mod pagesize), so glibc is probably ++ wrong, but here startOffset is calculated according to p_align for ++ compatibility. */ ++ Elf_Off startOffset = roundUp(fileContents->size(), alignStartPage); + + // In older version of binutils (2.30), readelf would check if the dynamic + // section segment is strictly smaller than the file (and not same size). diff --git a/poky/meta/recipes-devtools/patchelf/patchelf/0003-make-LOAD-segment-extensions-based-on-p_align-instea.patch b/poky/meta/recipes-devtools/patchelf/patchelf/0003-make-LOAD-segment-extensions-based-on-p_align-instea.patch new file mode 100644 index 0000000000..37eaf992d8 --- /dev/null +++ b/poky/meta/recipes-devtools/patchelf/patchelf/0003-make-LOAD-segment-extensions-based-on-p_align-instea.patch @@ -0,0 +1,32 @@ +From 299ad5766921d593e11a42a8e4dec55b4b350876 Mon Sep 17 00:00:00 2001 +From: Yuta Hayama <hayama@lineo.co.jp> +Date: Mon, 31 Jul 2023 11:58:49 +0900 +Subject: [PATCH] make LOAD segment extensions based on p_align instead of + pagesize + +Since the p_align of the LOAD segment is no longer pagesize, the actual p_align +value is used to calculate for the LOAD segment extension. + +If calculated with pagesize, new LOAD segment may be added even though the +existing LOAD segment can be extended. + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- +Upstream-Status: Submitted [https://github.com/NixOS/patchelf/pull/510] + + src/patchelf.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/patchelf.cc b/src/patchelf.cc +index 6edb81a..86429c4 100644 +--- a/src/patchelf.cc ++++ b/src/patchelf.cc +@@ -885,7 +885,7 @@ void ElfFile<ElfFileParamNames>::rewriteSectionsLibrary() + rdi(lastSeg.p_type) == PT_LOAD && + rdi(lastSeg.p_flags) == (PF_R | PF_W) && + rdi(lastSeg.p_align) == alignStartPage) { +- auto segEnd = roundUp(rdi(lastSeg.p_offset) + rdi(lastSeg.p_memsz), getPageSize()); ++ auto segEnd = roundUp(rdi(lastSeg.p_offset) + rdi(lastSeg.p_memsz), alignStartPage); + if (segEnd == startOffset) { + auto newSz = startOffset + neededSpace - rdi(lastSeg.p_offset); + wri(lastSeg.p_filesz, wri(lastSeg.p_memsz, newSz)); diff --git a/poky/meta/recipes-devtools/patchelf/patchelf_0.18.0.bb b/poky/meta/recipes-devtools/patchelf/patchelf_0.18.0.bb index e8bc2ff83d..dece34240c 100644 --- a/poky/meta/recipes-devtools/patchelf/patchelf_0.18.0.bb +++ b/poky/meta/recipes-devtools/patchelf/patchelf_0.18.0.bb @@ -4,7 +4,11 @@ HOMEPAGE = "https://github.com/NixOS/patchelf" LICENSE = "GPL-3.0-only" -SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master" +SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master \ + file://0001-Set-interpreter-only-when-necessary.patch \ + file://0002-align-startOffset-with-p_align-instead-of-pagesize-f.patch \ + file://0003-make-LOAD-segment-extensions-based-on-p_align-instea.patch \ +" SRCREV = "99c24238981b7b1084313aca8f5c493bb46f302c" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/python/python3-certifi_2023.5.7.bb b/poky/meta/recipes-devtools/python/python3-certifi_2023.7.22.bb index 924b05c12c..c4e1e7b917 100644 --- a/poky/meta/recipes-devtools/python/python3-certifi_2023.5.7.bb +++ b/poky/meta/recipes-devtools/python/python3-certifi_2023.7.22.bb @@ -7,7 +7,7 @@ HOMEPAGE = " http://certifi.io/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=3c2b7404369c587c3559afb604fce2f2" -SRC_URI[sha256sum] = "0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7" +SRC_URI[sha256sum] = "539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082" inherit pypi setuptools3 diff --git a/poky/meta/recipes-devtools/python/python3-chardet_5.1.0.bb b/poky/meta/recipes-devtools/python/python3-chardet_5.2.0.bb index 9b2644e648..cea7ebc94d 100644 --- a/poky/meta/recipes-devtools/python/python3-chardet_5.1.0.bb +++ b/poky/meta/recipes-devtools/python/python3-chardet_5.2.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://pypi.org/project/chardet/" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" -SRC_URI[sha256sum] = "0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5" +SRC_URI[sha256sum] = "1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7" # setup.py of chardet needs this. DEPENDS += "${PYTHON_PN}-pytest-runner-native" diff --git a/poky/meta/recipes-devtools/python/python3-cryptography-vectors_41.0.2.bb b/poky/meta/recipes-devtools/python/python3-cryptography-vectors_41.0.3.bb index 52f2c35315..1b499e0299 100644 --- a/poky/meta/recipes-devtools/python/python3-cryptography-vectors_41.0.2.bb +++ b/poky/meta/recipes-devtools/python/python3-cryptography-vectors_41.0.3.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ # NOTE: Make sure to keep this recipe at the same version as python3-cryptography # Upgrade both recipes at the same time -SRC_URI[sha256sum] = "028dff94a8522ca818b11295ff12df55f348f33a193c0597ddfe8239e53d1582" +SRC_URI[sha256sum] = "80de0452c4b34f56f5518e81ebd75b6b905f5728aaed521d42e41f4ebc8a43fb" PYPI_PACKAGE = "cryptography_vectors" diff --git a/poky/meta/recipes-devtools/python/python3-cryptography_41.0.2.bb b/poky/meta/recipes-devtools/python/python3-cryptography_41.0.3.bb index 20d6c97f36..b6ea6608eb 100644 --- a/poky/meta/recipes-devtools/python/python3-cryptography_41.0.2.bb +++ b/poky/meta/recipes-devtools/python/python3-cryptography_41.0.3.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ " LDSHARED += "-pthread" -SRC_URI[sha256sum] = "7d230bf856164de164ecb615ccc14c7fc6de6906ddd5b491f3af90d3514c925c" +SRC_URI[sha256sum] = "6d192741113ef5e30d89dcb5b956ef4e1578f304708701b8b73d38e3e1461f34" SRC_URI += "file://0001-pyproject.toml-remove-benchmark-disable-option.patch \ file://0001-Fix-include-directory-when-cross-compiling-9129.patch \ diff --git a/poky/meta/recipes-devtools/python/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch b/poky/meta/recipes-devtools/python/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch new file mode 100644 index 0000000000..a2df482e3a --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch @@ -0,0 +1,132 @@ +From 4d4703e0199fb3556c37694e4d951785abca22fd Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Wed, 19 Jan 2022 12:46:42 -0500 +Subject: [PATCH] Revert "libfdt: overlay: make overlay_get_target() public" + +This reverts commit 45f3d1a095dd3440578d5c6313eba555a791f3fb. + +Upstream-Status: Inappropriate [embedded specific] + +--- + libfdt/fdt_overlay.c | 29 ++++++++++++++++++++++------- + libfdt/libfdt.h | 18 ------------------ + libfdt/version.lds | 1 - + 3 files changed, 22 insertions(+), 26 deletions(-) + +diff --git a/libfdt/fdt_overlay.c b/libfdt/fdt_overlay.c +index 5c0c398..d217e79 100644 +--- a/libfdt/fdt_overlay.c ++++ b/libfdt/fdt_overlay.c +@@ -40,22 +40,37 @@ static uint32_t overlay_get_target_phandle(const void *fdto, int fragment) + return fdt32_to_cpu(*val); + } + +-int fdt_overlay_target_offset(const void *fdt, const void *fdto, +- int fragment_offset, char const **pathp) ++/** ++ * overlay_get_target - retrieves the offset of a fragment's target ++ * @fdt: Base device tree blob ++ * @fdto: Device tree overlay blob ++ * @fragment: node offset of the fragment in the overlay ++ * @pathp: pointer which receives the path of the target (or NULL) ++ * ++ * overlay_get_target() retrieves the target offset in the base ++ * device tree of a fragment, no matter how the actual targeting is ++ * done (through a phandle or a path) ++ * ++ * returns: ++ * the targeted node offset in the base device tree ++ * Negative error code on error ++ */ ++static int overlay_get_target(const void *fdt, const void *fdto, ++ int fragment, char const **pathp) + { + uint32_t phandle; + const char *path = NULL; + int path_len = 0, ret; + + /* Try first to do a phandle based lookup */ +- phandle = overlay_get_target_phandle(fdto, fragment_offset); ++ phandle = overlay_get_target_phandle(fdto, fragment); + if (phandle == (uint32_t)-1) + return -FDT_ERR_BADPHANDLE; + + /* no phandle, try path */ + if (!phandle) { + /* And then a path based lookup */ +- path = fdt_getprop(fdto, fragment_offset, "target-path", &path_len); ++ path = fdt_getprop(fdto, fragment, "target-path", &path_len); + if (path) + ret = fdt_path_offset(fdt, path); + else +@@ -621,7 +636,7 @@ static int overlay_merge(void *fdt, void *fdto) + if (overlay < 0) + return overlay; + +- target = fdt_overlay_target_offset(fdt, fdto, fragment, NULL); ++ target = overlay_get_target(fdt, fdto, fragment, NULL); + if (target < 0) + return target; + +@@ -764,7 +779,7 @@ static int overlay_symbol_update(void *fdt, void *fdto) + return -FDT_ERR_BADOVERLAY; + + /* get the target of the fragment */ +- ret = fdt_overlay_target_offset(fdt, fdto, fragment, &target_path); ++ ret = overlay_get_target(fdt, fdto, fragment, &target_path); + if (ret < 0) + return ret; + target = ret; +@@ -786,7 +801,7 @@ static int overlay_symbol_update(void *fdt, void *fdto) + + if (!target_path) { + /* again in case setprop_placeholder changed it */ +- ret = fdt_overlay_target_offset(fdt, fdto, fragment, &target_path); ++ ret = overlay_get_target(fdt, fdto, fragment, &target_path); + if (ret < 0) + return ret; + target = ret; +diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h +index a7f432c..7f117e8 100644 +--- a/libfdt/libfdt.h ++++ b/libfdt/libfdt.h +@@ -2116,24 +2116,6 @@ int fdt_del_node(void *fdt, int nodeoffset); + */ + int fdt_overlay_apply(void *fdt, void *fdto); + +-/** +- * fdt_overlay_target_offset - retrieves the offset of a fragment's target +- * @fdt: Base device tree blob +- * @fdto: Device tree overlay blob +- * @fragment_offset: node offset of the fragment in the overlay +- * @pathp: pointer which receives the path of the target (or NULL) +- * +- * fdt_overlay_target_offset() retrieves the target offset in the base +- * device tree of a fragment, no matter how the actual targeting is +- * done (through a phandle or a path) +- * +- * returns: +- * the targeted node offset in the base device tree +- * Negative error code on error +- */ +-int fdt_overlay_target_offset(const void *fdt, const void *fdto, +- int fragment_offset, char const **pathp); +- + /**********************************************************************/ + /* Debugging / informational functions */ + /**********************************************************************/ +diff --git a/libfdt/version.lds b/libfdt/version.lds +index cbce5d4..7ab85f1 100644 +--- a/libfdt/version.lds ++++ b/libfdt/version.lds +@@ -77,7 +77,6 @@ LIBFDT_1.2 { + fdt_appendprop_addrrange; + fdt_setprop_inplace_namelen_partial; + fdt_create_with_flags; +- fdt_overlay_target_offset; + local: + *; + }; +-- +2.19.1 + diff --git a/poky/meta/recipes-devtools/python/python3-dtc_1.6.1.bb b/poky/meta/recipes-devtools/python/python3-dtc_1.6.1.bb new file mode 100644 index 0000000000..a868bd0109 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-dtc_1.6.1.bb @@ -0,0 +1,26 @@ +SUMMARY = "Python Library for the Device Tree Compiler" +HOMEPAGE = "https://devicetree.org/" +DESCRIPTION = "A python library for the Device Tree Compiler, a tool used to manipulate Device Tree files which contain a data structure for describing hardware." +SECTION = "bootloader" +LICENSE = "GPL-2.0-only | BSD-2-Clause" + +DEPENDS = "flex-native bison-native swig-native python3-setuptools-scm-native libyaml dtc" + +SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \ + file://0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch \ + " + +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +LIC_FILES_CHKSUM = "file://pylibfdt/libfdt.i;beginline=1;endline=6;md5=afda088c974174a29108c8d80b5dce90" + +SRCREV = "c001fc01a43e7a06447c06ea3d50bd60641322b8" + +PV = "1.6.1+git${SRCPV}" +S = "${WORKDIR}/git" + +PYPA_WHEEL = "${S}/dist/libfdt-1.6.2*.whl" + +inherit setuptools3 pkgconfig + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-dtschema_2023.4.bb b/poky/meta/recipes-devtools/python/python3-dtschema_2023.6.1.bb index f87563facd..0c2c156ec4 100644 --- a/poky/meta/recipes-devtools/python/python3-dtschema_2023.4.bb +++ b/poky/meta/recipes-devtools/python/python3-dtschema_2023.6.1.bb @@ -7,9 +7,14 @@ inherit pypi setuptools3 PYPI_PACKAGE = "dtschema" -SRC_URI[sha256sum] = "6daefb8f54403b4d82961b3346571200571747ab01950fd36c1f69950fa7a8cf" +SRC_URI[sha256sum] = "d9dc11cea6a46ae2ee5ac4a5a1c7da7cb3704417cb390881820460f7c61eb784" DEPENDS += "python3-setuptools-scm-native" -RDEPENDS:${PN} += "python3-ruamel-yaml python3-jsonschema python3-rfc3987" +RDEPENDS:${PN} += "\ + python3-dtc \ + python3-jsonschema \ + python3-rfc3987 \ + python3-ruamel-yaml \ + " BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-hypothesis_6.81.2.bb b/poky/meta/recipes-devtools/python/python3-hypothesis_6.82.0.bb index 93bf638759..0aeeae1019 100644 --- a/poky/meta/recipes-devtools/python/python3-hypothesis_6.81.2.bb +++ b/poky/meta/recipes-devtools/python/python3-hypothesis_6.82.0.bb @@ -13,7 +13,7 @@ SRC_URI += " \ file://test_rle.py \ " -SRC_URI[sha256sum] = "e35165a73064370d30d476d7218f600d2bf861ff218192c9e994cb36aa190ae7" +SRC_URI[sha256sum] = "ffece8e40a34329e7112f7408f2c45fe587761978fdbc6f4f91bf0d683a7d4d9" RDEPENDS:${PN} += " \ python3-attrs \ diff --git a/poky/meta/recipes-devtools/python/python3-more-itertools_9.1.0.bb b/poky/meta/recipes-devtools/python/python3-more-itertools_10.0.0.bb index 8c33b7161b..e07d4b7860 100644 --- a/poky/meta/recipes-devtools/python/python3-more-itertools_9.1.0.bb +++ b/poky/meta/recipes-devtools/python/python3-more-itertools_10.0.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/erikrose/more-itertools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3396ea30f9d21389d7857719816f83b5" -SRC_URI[sha256sum] = "cabaa341ad0389ea83c17a94566a53ae4c9d07349861ecb14dc6d0345cf9ac5d" +SRC_URI[sha256sum] = "cd65437d7c4b615ab81c0640c0480bc29a550ea032891977681efd28344d51e1" inherit pypi python_flit_core ptest diff --git a/poky/meta/recipes-devtools/python/python3-pyyaml_6.0.bb b/poky/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb index d142a0fc3e..4ab8f038f4 100644 --- a/poky/meta/recipes-devtools/python/python3-pyyaml_6.0.bb +++ b/poky/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb @@ -9,7 +9,7 @@ PYPI_PACKAGE = "PyYAML" inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2" +SRC_URI[sha256sum] = "bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43" RDEPENDS:${PN} += "\ ${PYTHON_PN}-datetime \ diff --git a/poky/meta/recipes-devtools/python/python3-ruamel-yaml_0.17.32.bb b/poky/meta/recipes-devtools/python/python3-ruamel-yaml_0.17.32.bb index b745f349e7..4b5e77e6e3 100644 --- a/poky/meta/recipes-devtools/python/python3-ruamel-yaml_0.17.32.bb +++ b/poky/meta/recipes-devtools/python/python3-ruamel-yaml_0.17.32.bb @@ -1,6 +1,5 @@ SUMMARY = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order." HOMEPAGE = "https://pypi.org/project/ruamel.yaml/" -AUTHOR = "Anthon van der Neut" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=0e5f41db57c3a8d3584b450d35985ad1" diff --git a/poky/meta/recipes-devtools/python/python3-sphinx_7.0.1.bb b/poky/meta/recipes-devtools/python/python3-sphinx_7.1.1.bb index 10e01a2d7a..fa616cd504 100644 --- a/poky/meta/recipes-devtools/python/python3-sphinx_7.0.1.bb +++ b/poky/meta/recipes-devtools/python/python3-sphinx_7.1.1.bb @@ -4,13 +4,10 @@ SECTION = "devel/python" LICENSE = "BSD-2-Clause & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5eb6ac1b115a1ed24a12d9f15b633993" -PYPI_PACKAGE = "Sphinx" - -SRC_URI[sha256sum] = "61e025f788c5977d9412587e733733a289e2b9fdc2fef8868ddfbfc4ccfe881d" +SRC_URI[sha256sum] = "59b8e391f0768a96cd233e8300fe7f0a8dc2f64f83dc2a54336a9a84f428ff4e" inherit python_flit_core pypi - do_install:append () { # The cache format of "{None, 'en', 'ja'}" doesn't seem to be consistent (dict ordering?) rm ${D}${libdir}/${PYTHON_DIR}/site-packages/sphinx/writers/__pycache__/*latex* diff --git a/poky/meta/recipes-devtools/python/python3-urllib3_2.0.3.bb b/poky/meta/recipes-devtools/python/python3-urllib3_2.0.4.bb index 64b21db86d..0abd2adf65 100644 --- a/poky/meta/recipes-devtools/python/python3-urllib3_2.0.3.bb +++ b/poky/meta/recipes-devtools/python/python3-urllib3_2.0.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/shazow/urllib3" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=52d273a3054ced561275d4d15260ecda" -SRC_URI[sha256sum] = "bee28b5e56addb8226c96f7f13ac28cb4c301dd5ea8a6ca179c0b9835e032825" +SRC_URI[sha256sum] = "8d22f86aae8ef5e410d4f539fde9ce6b2113a001bb4d189e0aed70642d602b11" inherit pypi python_hatchling diff --git a/poky/meta/recipes-devtools/python/python3-wheel_0.40.0.bb b/poky/meta/recipes-devtools/python/python3-wheel_0.41.0.bb index 2b8111d544..2d8742545d 100644 --- a/poky/meta/recipes-devtools/python/python3-wheel_0.40.0.bb +++ b/poky/meta/recipes-devtools/python/python3-wheel_0.41.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7ffb0db04527cfe380e4f2726bd05ebf" -SRC_URI[sha256sum] = "cd1196f3faee2b31968d626e1731c94f99cbdb67cf5a46e4f5656cbee7738873" +SRC_URI[sha256sum] = "55a0f0a5a84869bce5ba775abfd9c462e3a6b1b7b7ec69d72c0b83d673a5114d" inherit python_flit_core pypi diff --git a/poky/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch b/poky/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch index 61dd4a5bc0..a7d37266ef 100644 --- a/poky/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch +++ b/poky/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch @@ -1,4 +1,4 @@ -From 01e02fb4720ecbbc44c694ee1b7fb6d5d95b5fe2 Mon Sep 17 00:00:00 2001 +From 0c8002d12149fdfbbcd9a9215876d474f157eb9c Mon Sep 17 00:00:00 2001 From: Yi Fan Yu <yifan.yu@windriver.com> Date: Thu, 1 Apr 2021 13:08:37 -0700 Subject: [PATCH] Skip failing tests due to load variability on YP AB @@ -11,16 +11,22 @@ Upstream-Status: Inappropriate [OE-Specific] Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> +Skip two additional tests due to suspected load variability failures. + +[YOCTO #15131] +[YOCTO #15177] + +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> --- - Lib/test/_test_multiprocessing.py | 2 ++ - Lib/test/test_time.py | 1 + - 2 files changed, 3 insertions(+) + Lib/test/_test_multiprocessing.py | 3 +++ + Lib/test/test_time.py | 2 ++ + 2 files changed, 5 insertions(+) diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py -index 599c3f2..23328be 100644 +index b50a154320..b8b2c4204d 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py -@@ -618,6 +618,7 @@ class _TestProcess(BaseTestCase): +@@ -618,6 +618,7 @@ def test_close(self): close_queue(q) @@ -28,7 +34,15 @@ index 599c3f2..23328be 100644 def test_many_processes(self): if self.TYPE == 'threads': self.skipTest('test not appropriate for {}'.format(self.TYPE)) -@@ -4890,6 +4891,7 @@ class TestWait(unittest.TestCase): +@@ -2003,6 +2004,7 @@ def _test_timeout_f(cls, barrier, results): + except threading.BrokenBarrierError: + results.append(True) + ++ @unittest.skip('timing related test, dependent on load') + def test_timeout(self): + """ + Test wait(timeout) +@@ -4890,6 +4892,7 @@ def signal_and_sleep(cls, sem, period): sem.release() time.sleep(period) @@ -37,10 +51,10 @@ index 599c3f2..23328be 100644 from multiprocessing.connection import wait diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py -index 884b142..542e980 100644 +index 884b14231f..8f0638c0d7 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py -@@ -492,6 +492,7 @@ class TimeTestCase(unittest.TestCase): +@@ -492,6 +492,7 @@ def test_perf_counter(self): @unittest.skipIf( support.is_wasi, "process_time not available on WASI" ) @@ -48,3 +62,14 @@ index 884b142..542e980 100644 def test_process_time(self): # process_time() should not include time spend during a sleep start = time.process_time() +@@ -505,6 +506,7 @@ def test_process_time(self): + self.assertTrue(info.monotonic) + self.assertFalse(info.adjustable) + ++ @unittest.skip('timing related test, dependent on load') + def test_thread_time(self): + if not hasattr(time, 'thread_time'): + if sys.platform.startswith(('linux', 'win')): +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/rust/files/bootstrap_fail.patch b/poky/meta/recipes-devtools/rust/files/bootstrap_fail.patch new file mode 100644 index 0000000000..1f44b6eaf6 --- /dev/null +++ b/poky/meta/recipes-devtools/rust/files/bootstrap_fail.patch @@ -0,0 +1,127 @@ +rust: Fix BOOTSTRAP_CARGO failure during Rust Oe-selftest + +BOOTSTRAP_CARGO command fails due to codegen flags like `-Cpanic` were +prevented from being reflected in the current target configuration which +leads to Rust build(rust version 1.70) failure in Oe-selftest. + +Upstream-Status: Backport [https://github.com/rust-lang/rust/commit/9dffb52738e0b2ccd15af36d4607a709b21e020c] + +Signed-off-by: Yash Shinde <yashinde145@gmail.com> +--- +diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs +--- a/src/tools/compiletest/src/common.rs ++++ b/src/tools/compiletest/src/common.rs +@@ -431,7 +431,6 @@ + .unwrap() + }; + +- let mut current = None; + let mut all_targets = HashSet::new(); + let mut all_archs = HashSet::new(); + let mut all_oses = HashSet::new(); +@@ -452,14 +451,11 @@ + } + all_pointer_widths.insert(format!("{}bit", cfg.pointer_width)); + +- if target == config.target { +- current = Some(cfg); +- } + all_targets.insert(target.into()); + } + + Self { +- current: current.expect("current target not found"), ++ current: Self::get_current_target_config(config), + all_targets, + all_archs, + all_oses, +@@ -471,6 +467,89 @@ + } + } + ++ fn get_current_target_config(config: &Config) -> TargetCfg { ++ let mut arch = None; ++ let mut os = None; ++ let mut env = None; ++ let mut abi = None; ++ let mut families = Vec::new(); ++ let mut pointer_width = None; ++ let mut endian = None; ++ let mut panic = None; ++ ++ for config in ++ rustc_output(config, &["--print=cfg", "--target", &config.target]).trim().lines() ++ { ++ let (name, value) = config ++ .split_once("=\"") ++ .map(|(name, value)| { ++ ( ++ name, ++ Some( ++ value ++ .strip_suffix("\"") ++ .expect("key-value pair should be properly quoted"), ++ ), ++ ) ++ }) ++ .unwrap_or_else(|| (config, None)); ++ ++ match name { ++ "target_arch" => { ++ arch = Some(value.expect("target_arch should be a key-value pair").to_string()); ++ } ++ "target_os" => { ++ os = Some(value.expect("target_os sould be a key-value pair").to_string()); ++ } ++ "target_env" => { ++ env = Some(value.expect("target_env should be a key-value pair").to_string()); ++ } ++ "target_abi" => { ++ abi = Some(value.expect("target_abi should be a key-value pair").to_string()); ++ } ++ "target_family" => { ++ families ++ .push(value.expect("target_family should be a key-value pair").to_string()); ++ } ++ "target_pointer_width" => { ++ pointer_width = Some( ++ value ++ .expect("target_pointer_width should be a key-value pair") ++ .parse::<u32>() ++ .expect("target_pointer_width should be a valid u32"), ++ ); ++ } ++ "target_endian" => { ++ endian = Some(match value.expect("target_endian should be a key-value pair") { ++ "big" => Endian::Big, ++ "little" => Endian::Little, ++ _ => panic!("target_endian should be either 'big' or 'little'"), ++ }); ++ } ++ "panic" => { ++ panic = Some(match value.expect("panic should be a key-value pair") { ++ "abort" => PanicStrategy::Abort, ++ "unwind" => PanicStrategy::Unwind, ++ _ => panic!("panic should be either 'abort' or 'unwind'"), ++ }); ++ } ++ _ => (), ++ } ++ } ++ ++ TargetCfg { ++ arch: arch.expect("target configuration should specify target_arch"), ++ os: os.expect("target configuration should specify target_os"), ++ env: env.expect("target configuration should specify target_env"), ++ abi: abi.expect("target configuration should specify target_abi"), ++ families, ++ pointer_width: pointer_width ++ .expect("target configuration should specify target_pointer_width"), ++ endian: endian.expect("target configuration should specify target_endian"), ++ panic: panic.expect("target configuration should specify panic"), ++ } ++ } ++ + // #[cfg(bootstrap)] + // Needed only for one cycle, remove during the bootstrap bump. + fn collect_all_slow(config: &Config) -> HashMap<String, TargetCfg> { diff --git a/poky/meta/recipes-devtools/rust/files/rust-oe-selftest.patch b/poky/meta/recipes-devtools/rust/files/rust-oe-selftest.patch deleted file mode 100644 index 8e9da47761..0000000000 --- a/poky/meta/recipes-devtools/rust/files/rust-oe-selftest.patch +++ /dev/null @@ -1,2324 +0,0 @@ -Rust testsuite outputs error even on a single testcase failure. -Hence, some test runs are ignored as they fail with error messages. - -Upstream-Status: Inappropriate [Ignore the testcase that errors out] -Signed-off-by: Pgowda <pgowda.cve@gmail.com> ---- - -diff --git a/compiler/rustc_interface/src/tests.rs b/compiler/rustc_interface/src/tests.rs -index eb8e65a6d..6e65e8787 100644 ---- a/compiler/rustc_interface/src/tests.rs -+++ b/compiler/rustc_interface/src/tests.rs -@@ -103,6 +103,7 @@ fn assert_non_crate_hash_different(x: &Options, y: &Options) { - - // When the user supplies --test we should implicitly supply --cfg test - #[test] -+#[ignore] - fn test_switch_implies_cfg_test() { - rustc_span::create_default_session_globals_then(|| { - let matches = optgroups().parse(&["--test".to_string()]).unwrap(); -@@ -114,6 +115,7 @@ fn test_switch_implies_cfg_test() { - - // When the user supplies --test and --cfg test, don't implicitly add another --cfg test - #[test] -+#[ignore] - fn test_switch_implies_cfg_test_unless_cfg_test() { - rustc_span::create_default_session_globals_then(|| { - let matches = optgroups().parse(&["--test".to_string(), "--cfg=test".to_string()]).unwrap(); -@@ -126,6 +128,7 @@ fn test_switch_implies_cfg_test_unless_cfg_test() { - } - - #[test] -+#[ignore] - fn test_can_print_warnings() { - rustc_span::create_default_session_globals_then(|| { - let matches = optgroups().parse(&["-Awarnings".to_string()]).unwrap(); -diff --git a/library/test/src/stats/tests.rs b/library/test/src/stats/tests.rs -index 3a6e8401b..8442a6b39 100644 ---- a/library/test/src/stats/tests.rs -+++ b/library/test/src/stats/tests.rs -@@ -40,6 +40,7 @@ fn check(samples: &[f64], summ: &Summary) { - } - - #[test] -+#[ignore] - fn test_min_max_nan() { - let xs = &[1.0, 2.0, f64::NAN, 3.0, 4.0]; - let summary = Summary::new(xs); -diff --git a/tests/assembly/asm/aarch64-outline-atomics.rs b/tests/assembly/asm/aarch64-outline-atomics.rs -index c2ec4e911..150d23004 100644 ---- a/tests/assembly/asm/aarch64-outline-atomics.rs -+++ b/tests/assembly/asm/aarch64-outline-atomics.rs -@@ -4,6 +4,7 @@ - // needs-llvm-components: aarch64 - // only-aarch64 - // only-linux -+// ignore-stage1 - - #![crate_type = "rlib"] - -diff --git a/tests/codegen/abi-main-signature-32bit-c-int.rs b/tests/codegen/abi-main-signature-32bit-c-int.rs -index 7f22ddcfc..ec84b72aa 100644 ---- a/tests/codegen/abi-main-signature-32bit-c-int.rs -+++ b/tests/codegen/abi-main-signature-32bit-c-int.rs -@@ -3,6 +3,7 @@ - - // This test is for targets with 32bit c_int only. - // ignore-msp430 -+// ignore-stage1 - - fn main() { - } -diff --git a/tests/codegen/sse42-implies-crc32.rs b/tests/codegen/sse42-implies-crc32.rs -index 47b1a8993..71e2d5ef7 100644 ---- a/tests/codegen/sse42-implies-crc32.rs -+++ b/tests/codegen/sse42-implies-crc32.rs -@@ -1,5 +1,6 @@ - // only-x86_64 - // compile-flags: -Copt-level=3 -+// ignore-stage1 - - #![crate_type = "lib"] - -diff --git a/tests/codegen/thread-local.rs b/tests/codegen/thread-local.rs -index 0f1b29ca7..b2b4fd2ff 100644 ---- a/tests/codegen/thread-local.rs -+++ b/tests/codegen/thread-local.rs -@@ -5,6 +5,7 @@ - // ignore-emscripten globals are used instead of thread locals - // ignore-android does not use #[thread_local] - // ignore-nto does not use #[thread_local] -+// ignore-stage1 - - #![crate_type = "lib"] - -diff --git a/tests/codegen/uninit-consts.rs b/tests/codegen/uninit-consts.rs -index 4c07740b3..dac5da866 100644 ---- a/tests/codegen/uninit-consts.rs -+++ b/tests/codegen/uninit-consts.rs -@@ -1,4 +1,5 @@ - // compile-flags: -C no-prepopulate-passes -+// ignore-stage1 - - // Check that we use undef (and not zero) for uninitialized bytes in constants. - -diff --git a/tests/pretty/raw-str-nonexpr.rs b/tests/pretty/raw-str-nonexpr.rs -index 12440b5ae..5b62d45ff 100644 ---- a/tests/pretty/raw-str-nonexpr.rs -+++ b/tests/pretty/raw-str-nonexpr.rs -@@ -1,5 +1,6 @@ - // needs-asm-support - // pp-exact -+// ignore-stage1 - - #[cfg(foo = r#"just parse this"#)] - extern crate blah as blah; -diff --git a/tests/run-make/issue-36710/Makefile b/tests/run-make/issue-36710/Makefile -index 7b91107a234..e404fcc3996 100644 ---- a/tests/run-make/issue-36710/Makefile -+++ b/tests/run-make/issue-36710/Makefile -@@ -6,6 +6,7 @@ - # ignore-musl FIXME: this makefile needs teaching how to use a musl toolchain - # (see dist-i586-gnu-i586-i686-musl Dockerfile) - # ignore-sgx -+# ignore-stage1 - - include ../tools.mk - -diff --git a/tests/rustdoc-ui/cfg-test.rs b/tests/rustdoc-ui/cfg-test.rs -index d4ca92585..fceb2968d 100644 ---- a/tests/rustdoc-ui/cfg-test.rs -+++ b/tests/rustdoc-ui/cfg-test.rs -@@ -5,6 +5,7 @@ - - // Crates like core have doctests gated on `cfg(not(test))` so we need to make - // sure `cfg(test)` is not active when running `rustdoc --test`. -+// ignore-stage1 - - /// this doctest will be ignored: - /// -diff --git a/tests/rustdoc-ui/check-cfg-test.rs b/tests/rustdoc-ui/check-cfg-test.rs -index 626cc8387..b0f9a1948 100644 ---- a/tests/rustdoc-ui/check-cfg-test.rs -+++ b/tests/rustdoc-ui/check-cfg-test.rs -@@ -3,6 +3,7 @@ - // normalize-stderr-test: "tests/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" -+// ignore-stage1 - - /// The doctest will produce a warning because feature invalid is unexpected - /// ``` -diff --git a/tests/rustdoc-ui/display-output.rs b/tests/rustdoc-ui/display-output.rs -index ec27a9f6b..61655fa6e 100644 ---- a/tests/rustdoc-ui/display-output.rs -+++ b/tests/rustdoc-ui/display-output.rs -@@ -5,6 +5,7 @@ - // compile-flags:--test --test-args=--show-output - // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" -+// ignore-stage1 - - /// ``` - /// #![warn(unused)] -diff --git a/tests/rustdoc-ui/doc-comment-multi-line-attr.rs b/tests/rustdoc-ui/doc-comment-multi-line-attr.rs -index 97259f782..50a155fba 100644 ---- a/tests/rustdoc-ui/doc-comment-multi-line-attr.rs -+++ b/tests/rustdoc-ui/doc-comment-multi-line-attr.rs -@@ -3,6 +3,7 @@ - // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" - // check-pass -+// ignore-stage1 - - //! ```rust - //! #![deny( -diff --git a/tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.rs b/tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.rs -index b2a8133c9..ea064ba85 100644 ---- a/tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.rs -+++ b/tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.rs -@@ -2,6 +2,7 @@ - // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" - // check-pass -+// ignore-stage1 - - /// ``` - /// # #![cfg_attr(not(dox), deny(missing_abi, -diff --git a/tests/rustdoc-ui/doc-test-doctest-feature.rs b/tests/rustdoc-ui/doc-test-doctest-feature.rs -index 0b79aaece..8cef6d974 100644 ---- a/tests/rustdoc-ui/doc-test-doctest-feature.rs -+++ b/tests/rustdoc-ui/doc-test-doctest-feature.rs -@@ -5,6 +5,7 @@ - - // Make sure `cfg(doctest)` is set when finding doctests but not inside - // the doctests. -+// ignore-stage1 - - /// ``` - /// assert!(!cfg!(doctest)); -diff --git a/tests/rustdoc-ui/doc-test-rustdoc-feature.rs b/tests/rustdoc-ui/doc-test-rustdoc-feature.rs -index bf334c67e..c372097bd 100644 ---- a/tests/rustdoc-ui/doc-test-rustdoc-feature.rs -+++ b/tests/rustdoc-ui/doc-test-rustdoc-feature.rs -@@ -2,6 +2,7 @@ - // compile-flags:--test - // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" -+// ignore-stage1 - - #![feature(doc_cfg)] - -diff --git a/tests/rustdoc-ui/doctest-output.rs b/tests/rustdoc-ui/doctest-output.rs -index 2670fa572..b4b612916 100644 ---- a/tests/rustdoc-ui/doctest-output.rs -+++ b/tests/rustdoc-ui/doctest-output.rs -@@ -4,6 +4,7 @@ - // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" - // check-pass -+// ignore-stage1 - - //! ``` - //! assert_eq!(1 + 1, 2); -diff --git a/tests/rustdoc-ui/failed-doctest-compile-fail.rs b/tests/rustdoc-ui/failed-doctest-compile-fail.rs -index 6f2ff5d70..2561ffdc3 100644 ---- a/tests/rustdoc-ui/failed-doctest-compile-fail.rs -+++ b/tests/rustdoc-ui/failed-doctest-compile-fail.rs -@@ -5,6 +5,7 @@ - // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" - // failure-status: 101 -+// ignore-stage1 - - /// ```compile_fail - /// println!("Hello"); -diff --git a/tests/rustdoc-ui/issue-91134.rs b/tests/rustdoc-ui/issue-91134.rs -index d2ff3a252..90e0816d2 100644 ---- a/tests/rustdoc-ui/issue-91134.rs -+++ b/tests/rustdoc-ui/issue-91134.rs -@@ -4,6 +4,7 @@ - // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" - // edition:2021 -+// ignore-stage1 - - /// <https://github.com/rust-lang/rust/issues/91134> - /// -diff --git a/tests/rustdoc-ui/nocapture.rs b/tests/rustdoc-ui/nocapture.rs -index 321f5ca08..463751e48 100644 ---- a/tests/rustdoc-ui/nocapture.rs -+++ b/tests/rustdoc-ui/nocapture.rs -@@ -2,6 +2,7 @@ - // compile-flags:--test -Zunstable-options --nocapture - // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" -+// ignore-stage1 - - /// ``` - /// println!("hello!"); -diff --git a/tests/rustdoc-ui/run-directory.rs b/tests/rustdoc-ui/run-directory.rs -index 0d432c1e6..357e3ccc3 100644 ---- a/tests/rustdoc-ui/run-directory.rs -+++ b/tests/rustdoc-ui/run-directory.rs -@@ -6,6 +6,7 @@ - // [incorrect]compile-flags:--test --test-run-directory={{src-base}}/coverage - // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" -+// ignore-stage1 - - /// ``` - /// assert_eq!( -diff --git a/tests/rustdoc-ui/test-no_std.rs b/tests/rustdoc-ui/test-no_std.rs -index ee919985e..3e479bf6f 100644 ---- a/tests/rustdoc-ui/test-no_std.rs -+++ b/tests/rustdoc-ui/test-no_std.rs -@@ -2,6 +2,7 @@ - // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" - // check-pass -+// ignore-stage1 - - #![no_std] - -diff --git a/tests/rustdoc-ui/test-type.rs b/tests/rustdoc-ui/test-type.rs -index 882da5c25..bc8e8e30f 100644 ---- a/tests/rustdoc-ui/test-type.rs -+++ b/tests/rustdoc-ui/test-type.rs -@@ -2,6 +2,7 @@ - // check-pass - // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" -+// ignore-stage1 - - /// ``` - /// let a = true; -diff --git a/tests/ui-fulldeps/internal-lints/default_hash_types.rs b/tests/ui-fulldeps/internal-lints/default_hash_types.rs -index 795c7d2dc..dc6b4f53f 100644 ---- a/tests/ui-fulldeps/internal-lints/default_hash_types.rs -+++ b/tests/ui-fulldeps/internal-lints/default_hash_types.rs -@@ -1,4 +1,5 @@ - // compile-flags: -Z unstable-options -+// ignore-stage1 - - #![feature(rustc_private)] - #![deny(rustc::default_hash_types)] -diff --git a/tests/ui-fulldeps/internal-lints/diagnostics.rs b/tests/ui-fulldeps/internal-lints/diagnostics.rs -index 643e81d99..2433228ef 100644 ---- a/tests/ui-fulldeps/internal-lints/diagnostics.rs -+++ b/tests/ui-fulldeps/internal-lints/diagnostics.rs -@@ -1,4 +1,5 @@ - // compile-flags: -Z unstable-options -+// ignore-stage1 - - #![crate_type = "lib"] - #![feature(rustc_attrs)] -diff --git a/tests/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.rs b/tests/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.rs -index f6f0c0385..4523e2a6d 100644 ---- a/tests/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.rs -+++ b/tests/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.rs -@@ -1,4 +1,5 @@ - // compile-flags: -Z unstable-options -+// ignore-stage1 - - #![feature(rustc_private)] - #![deny(rustc::lint_pass_impl_without_macro)] -diff --git a/tests/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.rs b/tests/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.rs -index 32b987338..6187e2370 100644 ---- a/tests/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.rs -+++ b/tests/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.rs -@@ -1,4 +1,5 @@ - // compile-flags: -Z unstable-options -+// ignore-stage1 - - #![feature(rustc_private)] - #![deny(rustc::usage_of_qualified_ty)] -diff --git a/tests/ui-fulldeps/internal-lints/query_stability.rs b/tests/ui-fulldeps/internal-lints/query_stability.rs -index 560675b44..e7d5ba583 100644 ---- a/tests/ui-fulldeps/internal-lints/query_stability.rs -+++ b/tests/ui-fulldeps/internal-lints/query_stability.rs -@@ -1,4 +1,5 @@ - // compile-flags: -Z unstable-options -+// ignore-stage1 - - #![feature(rustc_private)] - #![deny(rustc::potential_query_instability)] -diff --git a/tests/ui-fulldeps/internal-lints/rustc_pass_by_value.rs b/tests/ui-fulldeps/internal-lints/rustc_pass_by_value.rs -index 10bab2d88..8e72c8b38 100644 ---- a/tests/ui-fulldeps/internal-lints/rustc_pass_by_value.rs -+++ b/tests/ui-fulldeps/internal-lints/rustc_pass_by_value.rs -@@ -1,4 +1,5 @@ - // compile-flags: -Z unstable-options -+// ignore-stage1 - - #![feature(rustc_attrs)] - #![feature(rustc_private)] -diff --git a/tests/ui-fulldeps/internal-lints/ty_tykind_usage.rs b/tests/ui-fulldeps/internal-lints/ty_tykind_usage.rs -index 2cb1ed6fc..31b5a2131 100644 ---- a/tests/ui-fulldeps/internal-lints/ty_tykind_usage.rs -+++ b/tests/ui-fulldeps/internal-lints/ty_tykind_usage.rs -@@ -1,4 +1,5 @@ - // compile-flags: -Z unstable-options -+// ignore-stage1 - - #![feature(rustc_private)] - -diff --git a/tests/ui-fulldeps/lint-group-denied-lint-allowed.rs b/tests/ui-fulldeps/lint-group-denied-lint-allowed.rs -index 7498745f2..28c00f2f8 100644 ---- a/tests/ui-fulldeps/lint-group-denied-lint-allowed.rs -+++ b/tests/ui-fulldeps/lint-group-denied-lint-allowed.rs -@@ -1,6 +1,7 @@ - // aux-build:lint-group-plugin-test.rs - // check-pass - // compile-flags: -D unused -A unused-variables -+// ignore-stage1 - - fn main() { - let x = 1; -diff --git a/tests/ui-fulldeps/lint-group-forbid-always-trumps-cli.rs b/tests/ui-fulldeps/lint-group-forbid-always-trumps-cli.rs -index fc19bc039..9563e9930 100644 ---- a/tests/ui-fulldeps/lint-group-forbid-always-trumps-cli.rs -+++ b/tests/ui-fulldeps/lint-group-forbid-always-trumps-cli.rs -@@ -1,5 +1,6 @@ - // aux-build:lint-group-plugin-test.rs - // compile-flags: -F unused -A unused -+// ignore-stage1 - - fn main() { - let x = 1; -diff --git a/tests/ui-fulldeps/lint-pass-macros.rs b/tests/ui-fulldeps/lint-pass-macros.rs -index b3c2a5427..9ed711a34 100644 ---- a/tests/ui-fulldeps/lint-pass-macros.rs -+++ b/tests/ui-fulldeps/lint-pass-macros.rs -@@ -1,5 +1,6 @@ - // compile-flags: -Z unstable-options - // check-pass -+// ignore-stage1 - - #![feature(rustc_private)] - -diff --git a/tests/ui/empty_global_asm.rs b/tests/ui/empty_global_asm.rs -index af13762d1..e9a5433ff 100644 ---- a/tests/ui/empty_global_asm.rs -+++ b/tests/ui/empty_global_asm.rs -@@ -1,5 +1,6 @@ - // needs-asm-support - // run-pass -+// ignore-stage1 - - use std::arch::global_asm; - -diff --git a/tests/ui/linkage-attr/issue-10755.rs b/tests/ui/linkage-attr/issue-10755.rs -index afd2dc46c..f0d4705e4 100644 ---- a/tests/ui/linkage-attr/issue-10755.rs -+++ b/tests/ui/linkage-attr/issue-10755.rs -@@ -2,6 +2,7 @@ - // dont-check-compiler-stderr - // compile-flags: -C linker=llllll -C linker-flavor=ld - // error-pattern: `llllll` -+// ignore-stage1 - - // Before, the error-pattern checked for "not found". On WSL with appendWindowsPath=true, running - // in invalid command returns a PermissionDenied instead. -diff --git a/tests/ui/macros/restricted-shadowing-legacy.rs b/tests/ui/macros/restricted-shadowing-legacy.rs -index f5cac2dfb..d84f8efd6 100644 ---- a/tests/ui/macros/restricted-shadowing-legacy.rs -+++ b/tests/ui/macros/restricted-shadowing-legacy.rs -@@ -74,6 +74,7 @@ - // 62 | Unordered | Unordered | = | +? | - // 63 | Unordered | Unordered | > | +? | - // 64 | Unordered | Unordered | Unordered | + | -+// ignore-stage1 - - #![feature(decl_macro, rustc_attrs)] - -diff --git a/tests/ui/process/nofile-limit.rs b/tests/ui/process/nofile-limit.rs -index 3ddf8d6ef..316823fcc 100644 ---- a/tests/ui/process/nofile-limit.rs -+++ b/tests/ui/process/nofile-limit.rs -@@ -3,6 +3,7 @@ - // test for issue #96621. - // - // run-pass -+// ignore-stage1 - // dont-check-compiler-stderr - // only-linux - // no-prefer-dynamic -diff --git a/tests/ui/process/process-panic-after-fork.rs b/tests/ui/process/process-panic-after-fork.rs -index 6d4d24922..f681526bd 100644 ---- a/tests/ui/process/process-panic-after-fork.rs -+++ b/tests/ui/process/process-panic-after-fork.rs -@@ -6,6 +6,7 @@ - // ignore-emscripten no processes - // ignore-sgx no processes - // ignore-fuchsia no fork -+// ignore-stage1 - - #![feature(rustc_private)] - #![feature(never_type)] -diff --git a/tests/ui/simd/target-feature-mixup.rs b/tests/ui/simd/target-feature-mixup.rs -index 5dd163715..ab8b02f23 100644 ---- a/tests/ui/simd/target-feature-mixup.rs -+++ b/tests/ui/simd/target-feature-mixup.rs -@@ -1,4 +1,6 @@ - // run-pass -+// ignore-stage1 -+ - #![allow(unused_variables)] - #![allow(stable_features)] - #![allow(overflowing_literals)] -diff --git a/tests/ui-fulldeps/internal-lints/bad_opt_access.rs b/tests/ui-fulldeps/internal-lints/bad_opt_access.rs -index d6bd6945e15..a5794e3636a 100644 ---- a/tests/ui-fulldeps/internal-lints/bad_opt_access.rs -+++ b/tests/ui-fulldeps/internal-lints/bad_opt_access.rs -@@ -3,6 +3,7 @@ - // Test that accessing command line options by field access triggers a lint for those fields - // that have wrapper functions which should be used. - -+// ignore-stage1 - #![crate_type = "lib"] - #![feature(rustc_private)] - #![deny(rustc::bad_opt_access)] -diff --git a/tests/ui-fulldeps/session-diagnostic/enforce_slug_naming.rs b/tests/ui-fulldeps/session-diagnostic/enforce_slug_naming.rs -index a0a8114e0c5..29faed24e13 100644 ---- a/tests/ui-fulldeps/session-diagnostic/enforce_slug_naming.rs -+++ b/tests/ui-fulldeps/session-diagnostic/enforce_slug_naming.rs -@@ -1,5 +1,6 @@ - // rustc-env:CARGO_CRATE_NAME=rustc_dummy - -+// ignore-stage1 - #![feature(rustc_private)] - #![crate_type = "lib"] - -diff --git a/tests/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs b/tests/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs -index ff764015dc7..8d0184b40f5 100644 ---- a/tests/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs -+++ b/tests/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs -@@ -5,4 +5,5 @@ - // - // Make sure that we don't explode with an error if we don't actually end up emitting any `dwo`s, - // as would be the case if we don't actually codegen anything. -+// ignore-stage1 - #![crate_type="rlib"] -diff --git a/tests/ui/drop/dynamic-drop.rs b/tests/ui/drop/dynamic-drop.rs -index 9e51d3adaaa..296032acebb 100644 ---- a/tests/ui/drop/dynamic-drop.rs -+++ b/tests/ui/drop/dynamic-drop.rs -@@ -1,6 +1,7 @@ - // run-pass - // needs-unwind - -+// ignore-stage1 - #![feature(generators, generator_trait)] - - #![allow(unused_assignments)] -diff --git a/src/bootstrap/builder/tests.rs b/src/bootstrap/builder/tests.rs -index 3574f11189e..4f4698a25bd 100644 ---- a/src/bootstrap/builder/tests.rs -+++ b/src/bootstrap/builder/tests.rs -@@ -76,6 +76,7 @@ macro_rules! rustc { - } - - #[test] -+#[ignore] - fn test_valid() { - // make sure multi suite paths are accepted - check_cli(["test", "tests/ui/attr-start.rs", "tests/ui/attr-shebang.rs"]); -@@ -104,6 +105,7 @@ fn test_intersection() { - } - - #[test] -+#[ignore] - fn test_exclude() { - let mut config = configure("test", &["A"], &["A"]); - config.exclude = vec![TaskPath::parse("src/tools/tidy")]; -@@ -117,6 +119,7 @@ fn test_exclude() { - } - - #[test] -+#[ignore] - fn test_exclude_kind() { - let path = PathBuf::from("src/tools/cargotest"); - let exclude = TaskPath::parse("test::src/tools/cargotest"); -@@ -137,6 +140,7 @@ fn test_exclude_kind() { - - /// Ensure that if someone passes both a single crate and `library`, all library crates get built. - #[test] -+#[ignore] - fn alias_and_path_for_library() { - let mut cache = - run_build(&["library".into(), "core".into()], configure("build", &["A"], &["A"])); -@@ -153,6 +157,7 @@ mod defaults { - use pretty_assertions::assert_eq; - - #[test] -+ #[ignore] - fn build_default() { - let mut cache = run_build(&[], configure("build", &["A"], &["A"])); - -@@ -173,6 +178,7 @@ fn build_default() { - } - - #[test] -+ #[ignore] - fn build_stage_0() { - let config = Config { stage: 0, ..configure("build", &["A"], &["A"]) }; - let mut cache = run_build(&[], config); -@@ -190,6 +196,7 @@ fn build_stage_0() { - } - - #[test] -+ #[ignore] - fn build_cross_compile() { - let config = Config { stage: 1, ..configure("build", &["A", "B"], &["A", "B"]) }; - let mut cache = run_build(&[], config); -@@ -233,6 +240,7 @@ fn build_cross_compile() { - } - - #[test] -+ #[ignore] - fn doc_default() { - let mut config = configure("doc", &["A"], &["A"]); - config.compiler_docs = true; -@@ -267,6 +275,7 @@ fn configure(host: &[&str], target: &[&str]) -> Config { - } - - #[test] -+ #[ignore] - fn dist_baseline() { - let mut cache = run_build(&[], configure(&["A"], &["A"])); - -@@ -291,6 +300,7 @@ fn dist_baseline() { - } - - #[test] -+ #[ignore] - fn dist_with_targets() { - let mut cache = run_build(&[], configure(&["A"], &["A", "B"])); - -@@ -320,6 +330,7 @@ fn dist_with_targets() { - } - - #[test] -+ #[ignore] - fn dist_with_hosts() { - let mut cache = run_build(&[], configure(&["A", "B"], &["A", "B"])); - -@@ -362,6 +373,7 @@ fn dist_with_hosts() { - } - - #[test] -+ #[ignore] - fn dist_only_cross_host() { - let b = TargetSelection::from_user("B"); - let mut config = configure(&["A", "B"], &["A", "B"]); -@@ -381,6 +393,7 @@ fn dist_only_cross_host() { - } - - #[test] -+ #[ignore] - fn dist_with_targets_and_hosts() { - let mut cache = run_build(&[], configure(&["A", "B"], &["A", "B", "C"])); - -@@ -415,6 +428,7 @@ fn dist_with_targets_and_hosts() { - } - - #[test] -+ #[ignore] - fn dist_with_empty_host() { - let config = configure(&[], &["C"]); - let mut cache = run_build(&[], config); -@@ -431,6 +445,7 @@ fn dist_with_empty_host() { - } - - #[test] -+ #[ignore] - fn dist_with_same_targets_and_hosts() { - let mut cache = run_build(&[], configure(&["A", "B"], &["A", "B"])); - -@@ -482,6 +497,7 @@ fn dist_with_same_targets_and_hosts() { - } - - #[test] -+ #[ignore] - fn build_all() { - let build = Build::new(configure(&["A", "B"], &["A", "B", "C"])); - let mut builder = Builder::new(&build); -@@ -515,6 +531,7 @@ fn build_all() { - } - - #[test] -+ #[ignore] - fn build_with_empty_host() { - let config = configure(&[], &["C"]); - let build = Build::new(config); -@@ -542,6 +559,7 @@ fn build_with_empty_host() { - } - - #[test] -+ #[ignore] - fn test_with_no_doc_stage0() { - let mut config = configure(&["A"], &["A"]); - config.stage = 0; -@@ -585,6 +603,7 @@ fn test_with_no_doc_stage0() { - } - - #[test] -+ #[ignore] - fn doc_ci() { - let mut config = configure(&["A"], &["A"]); - config.compiler_docs = true; -@@ -613,6 +632,7 @@ fn doc_ci() { - } - - #[test] -+ #[ignore] - fn test_docs() { - // Behavior of `x.py test` doing various documentation tests. - let mut config = configure(&["A"], &["A"]); -diff --git a/tests/ui-fulldeps/internal-lints/bad_opt_access.stderr b/tests/ui-fulldeps/internal-lints/bad_opt_access.stderr ---- a/tests/ui-fulldeps/internal-lints/bad_opt_access.stderr 2023-01-10 10:47:33.000000000 -0800 -+++ b/tests/ui-fulldeps/internal-lints/bad_opt_access.stderr 2023-01-20 03:49:06.575109271 -0800 -@@ -1,20 +1,11 @@ --error: use `Session::split_debuginfo` instead of this field -- --> $DIR/bad_opt_access.rs:14:13 -+error[E0463]: can't find crate for `rustc_macros` which `rustc_session` depends on -+ --> $DIR/bad_opt_access.rs:10:1 - | --LL | let _ = sess.opts.cg.split_debuginfo; -- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -+LL | extern crate rustc_session; -+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't find crate - | --note: the lint level is defined here -- --> $DIR/bad_opt_access.rs:8:9 -- | --LL | #![deny(rustc::bad_opt_access)] -- | ^^^^^^^^^^^^^^^^^^^^^ -- --error: use `Session::crate_types` instead of this field -- --> $DIR/bad_opt_access.rs:17:13 -- | --LL | let _ = sess.opts.crate_types; -- | ^^^^^^^^^^^^^^^^^^^^^ -+ = help: maybe you need to install the missing components with: `rustup component add rust-src rustc-dev llvm-tools-preview` - --error: aborting due to 2 previous errors -+error: aborting due to previous error - -+For more information about this error, try `rustc --explain E0463`. -diff --git a/tests/ui/process/process-sigpipe.rs b/tests/ui/process/process-sigpipe.rs ---- a/tests/ui/process/process-sigpipe.rs 2023-01-10 10:47:33.000000000 -0800 -+++ b/tests/ui/process/process-sigpipe.rs 2023-01-27 01:07:05.335718181 -0800 -@@ -1,4 +1,5 @@ - // run-pass -+// ignore-stage1 - #![allow(unused_imports)] - #![allow(deprecated)] - -diff --git a/tests/run-make/static-pie/Makefile b/tests/run-make/static-pie/Makefile ---- a/tests/run-make/static-pie/Makefile 2023-02-21 02:25:36.553233415 -0800 -+++ b/tests/run-make/static-pie/Makefile 2023-02-21 02:19:45.848629908 -0800 -@@ -3,6 +3,7 @@ include ../../run-make-fulldeps/tools.mk - # only-x86_64 - # only-linux - # ignore-32bit -+# ignore-stage1 - - # How to manually run this - # $ ./x.py test --target x86_64-unknown-linux-[musl,gnu] tests/run-make/static-pie -diff --git a/tests/codegen/repr-transparent-aggregates-3.rs b/tests/codegen/repr-transparent-aggregates-3.rs -index 0db17e6b13a..6e9cb7224c8 100644 ---- a/tests/codegen/repr-transparent-aggregates-3.rs -+++ b/tests/codegen/repr-transparent-aggregates-3.rs -@@ -3,6 +3,7 @@ - - // only-mips64 - // See repr-transparent.rs -+// ignore-stage1 - - #![feature(transparent_unions)] - -diff --git a/tests/codegen/abi-repr-ext.rs b/tests/codegen/abi-repr-ext.rs -index 23ade3c7216..addd8a2ebdc 100644 ---- a/tests/codegen/abi-repr-ext.rs -+++ b/tests/codegen/abi-repr-ext.rs -@@ -1,4 +1,5 @@ - // compile-flags: -O -+// ignore-stage1 - - // revisions:x86_64 i686 aarch64-apple aarch64-windows aarch64-linux arm riscv - -diff --git a/tests/codegen/abi-x86-interrupt.rs b/tests/codegen/abi-x86-interrupt.rs -index 928ad5a9bbd..5185edaae40 100644 ---- a/tests/codegen/abi-x86-interrupt.rs -+++ b/tests/codegen/abi-x86-interrupt.rs -@@ -4,6 +4,7 @@ - - // needs-llvm-components: x86 - // compile-flags: -C no-prepopulate-passes --target=x86_64-unknown-linux-gnu -Copt-level=0 -+// ignore-stage1 - - #![crate_type = "lib"] - #![no_core] -diff --git a/tests/codegen/branch-protection.rs b/tests/codegen/branch-protection.rs -index 994c71b2619..5d83a29da74 100644 ---- a/tests/codegen/branch-protection.rs -+++ b/tests/codegen/branch-protection.rs -@@ -7,6 +7,7 @@ - // [LEAF] compile-flags: -Z branch-protection=pac-ret,leaf - // [BKEY] compile-flags: -Z branch-protection=pac-ret,b-key - // compile-flags: --target aarch64-unknown-linux-gnu -+// ignore-stage1 - - #![crate_type = "lib"] - #![feature(no_core, lang_items)] -diff --git a/tests/codegen/catch-unwind.rs b/tests/codegen/catch-unwind.rs -index b90ef104ce7..12d5d1451a2 100644 ---- a/tests/codegen/catch-unwind.rs -+++ b/tests/codegen/catch-unwind.rs -@@ -10,6 +10,7 @@ - // ignore-riscv64 FIXME - // On s390x the closure is also in another function - // ignore-s390x FIXME -+// ignore-stage1 - - #![crate_type = "lib"] - #![feature(c_unwind)] -diff --git a/tests/codegen/cf-protection.rs b/tests/codegen/cf-protection.rs -index ccbc863f571..f4281d87abf 100644 ---- a/tests/codegen/cf-protection.rs -+++ b/tests/codegen/cf-protection.rs -@@ -8,6 +8,7 @@ - // [return] compile-flags: -Z cf-protection=return - // [full] compile-flags: -Z cf-protection=full - // compile-flags: --target x86_64-unknown-linux-gnu -+// ignore-stage1 - - #![crate_type = "lib"] - #![feature(no_core, lang_items)] -diff --git a/tests/codegen/enum-bounds-check-derived-idx.rs b/tests/codegen/enum-bounds-check-derived-idx.rs -index aa66c2ed08e..db6c87c7338 100644 ---- a/tests/codegen/enum-bounds-check-derived-idx.rs -+++ b/tests/codegen/enum-bounds-check-derived-idx.rs -@@ -1,7 +1,7 @@ - // This test checks an optimization that is not guaranteed to work. This test case should not block - // a future LLVM update. - // compile-flags: -O -- -+// ignore-stage1 - #![crate_type = "lib"] - - pub enum Bar { -diff --git a/tests/codegen/force-unwind-tables.rs b/tests/codegen/force-unwind-tables.rs -index 4c0a5602c6d..d5faf190290 100644 ---- a/tests/codegen/force-unwind-tables.rs -+++ b/tests/codegen/force-unwind-tables.rs -@@ -1,5 +1,5 @@ - // compile-flags: -C no-prepopulate-passes -C force-unwind-tables=y -- -+// ignore-stage1 - #![crate_type="lib"] - - // CHECK: attributes #{{.*}} uwtable -diff --git a/tests/codegen/intrinsic-no-unnamed-attr.rs b/tests/codegen/intrinsic-no-unnamed-attr.rs -index c8a8e0b3e7a..f779f5cc27e 100644 ---- a/tests/codegen/intrinsic-no-unnamed-attr.rs -+++ b/tests/codegen/intrinsic-no-unnamed-attr.rs -@@ -1,5 +1,5 @@ - // compile-flags: -C no-prepopulate-passes -- -+// ignore-stage1 - #![feature(intrinsics)] - - extern "rust-intrinsic" { -diff --git a/tests/codegen/issues/issue-103840.rs b/tests/codegeni/issues/issue-103840.rs -index f19d7031bb3..92408e75964 100644 ---- a/tests/codegen/issues/issue-103840.rs -+++ b/tests/codegen/issues/issue-103840.rs -@@ -1,5 +1,6 @@ - // compile-flags: -O - #![crate_type = "lib"] -+// ignore-stage1 - - pub fn foo(t: &mut Vec<usize>) { - // CHECK-NOT: __rust_dealloc -diff --git a/tests/codegen/issues/issue-47278.rs b/tests/codegen/issues/issue-47278.rs -index 9076274f45e..de7203e139b 100644 ---- a/tests/codegen/issues/issue-47278.rs -+++ b/tests/codegen/issues/issue-47278.rs -@@ -1,5 +1,6 @@ - // -C no-prepopulate-passes - #![crate_type="staticlib"] -+// ignore-stage1 - - #[repr(C)] - pub struct Foo(u64); -diff --git a/tests/codegen/issues/issue-73827-bounds-check-index-in-subexpr.rs b/tests/codegen/issues/issue-73827-bounds-check-index-in-subexpr.rs -index 1ad05906e21..8df862aeee5 100644 ---- a/tests/codegen/issues/issue-73827-bounds-check-index-in-subexpr.rs -+++ b/tests/codegen/issues/issue-73827-bounds-check-index-in-subexpr.rs -@@ -2,6 +2,7 @@ - // index is part of a (x | y) < C style condition - - // compile-flags: -O -+// ignore-stage1 - - #![crate_type = "lib"] - -diff --git a/tests/codegen/lifetime_start_end.rs b/tests/codegen/lifetime_start_end.rs -index 471a0b8cedd..356650de0c1 100644 ---- a/tests/codegen/lifetime_start_end.rs -+++ b/tests/codegen/lifetime_start_end.rs -@@ -1,4 +1,5 @@ - // compile-flags: -O -C no-prepopulate-passes -Zmir-opt-level=0 -+// ignore-stage1 - - #![crate_type = "lib"] - -diff --git a/tests/codegen/local-generics-in-exe-internalized.rs b/tests/codegen/local-generics-in-exe-internalized.rs -index 449c5ca75fc..746a7ed1b6f 100644 ---- a/tests/codegen/local-generics-in-exe-internalized.rs -+++ b/tests/codegen/local-generics-in-exe-internalized.rs -@@ -1,4 +1,5 @@ - // compile-flags: -C no-prepopulate-passes -Zshare-generics=yes -+// ignore-stage1 - - // Check that local generics are internalized if they are in the same CGU - -diff --git a/tests/codegen/match-unoptimized.rs b/tests/codegen/match-unoptimized.rs -index 78ea4f9b409..23b2c62bd38 100644 ---- a/tests/codegen/match-unoptimized.rs -+++ b/tests/codegen/match-unoptimized.rs -@@ -1,4 +1,5 @@ - // compile-flags: -C no-prepopulate-passes -Copt-level=0 -+// ignore-stage1 - - #![crate_type = "lib"] - -diff --git a/tests/codegen/noalias-rwlockreadguard.rs b/tests/codegen/noalias-rwlockreadguard.rs -index 7f7b46c85a8..a32910da3e7 100644 ---- a/tests/codegen/noalias-rwlockreadguard.rs -+++ b/tests/codegen/noalias-rwlockreadguard.rs -@@ -1,4 +1,5 @@ - // compile-flags: -O -C no-prepopulate-passes -Z mutable-noalias=yes -+// ignore-stage1 - - #![crate_type = "lib"] - -diff --git a/tests/codegen/non-terminate/nonempty-infinite-loop.rs b/tests/codegen/non-terminate/nonempty-infinite-loop.rs -index 5e25e04fc24..fce094f7efd 100644 ---- a/tests/codegen/non-terminate/nonempty-infinite-loop.rs -+++ b/tests/codegen/non-terminate/nonempty-infinite-loop.rs -@@ -1,4 +1,5 @@ - // compile-flags: -C opt-level=3 -+// ignore-stage1 - - #![crate_type = "lib"] - -diff --git a/tests/codegen/noreturn-uninhabited.rs b/tests/codegen/noreturn-uninhabited.rs -index 49f93cf62c7..2da42faeabd 100644 ---- a/tests/codegen/noreturn-uninhabited.rs -+++ b/tests/codegen/noreturn-uninhabited.rs -@@ -1,4 +1,5 @@ - // compile-flags: -g -C no-prepopulate-passes -+// ignore-stage1 - - #![crate_type = "lib"] - -diff --git a/tests/rustdoc/async-move-doctest.rs b/tests/rustdoc/async-move-doctest.rs -index 2ba61388c9e..402c5bbaaf7 100644 ---- a/tests/rustdoc/async-move-doctest.rs -+++ b/tests/rustdoc/async-move-doctest.rs -@@ -1,5 +1,6 @@ - // compile-flags:--test - // edition:2018 -+// ignore-stage1 - - // Prior to setting the default edition for the doctest pre-parser, - // this doctest would fail due to a fatal parsing error. -diff --git a/tests/rustdoc/async-trait.rs b/tests/rustdoc/async-trait.rs -index a473e467473..df3be5adc17 100644 ---- a/tests/rustdoc/async-trait.rs -+++ b/tests/rustdoc/async-trait.rs -@@ -1,5 +1,6 @@ - // aux-build:async-trait-dep.rs - // edition:2021 -+// ignore-stage1 - - #![feature(async_fn_in_trait)] - #![allow(incomplete_features)] -diff --git a/tests/rustdoc/check-source-code-urls-to-def.rs b/tests/rustdoc/check-source-code-urls-to-def.rs -index 41b9d41fa44..0805a07a0c9 100644 ---- a/tests/rustdoc/check-source-code-urls-to-def.rs -+++ b/tests/rustdoc/check-source-code-urls-to-def.rs -@@ -1,6 +1,7 @@ - // compile-flags: -Zunstable-options --generate-link-to-definition - // aux-build:source_code.rs - // build-aux-docs -+// ignore-stage1 - - #![feature(rustc_attrs)] - -diff --git a/tests/rustdoc/comment-in-doctest.rs b/tests/rustdoc/comment-in-doctest.rs -index 5691d173569..a57c0e1f3bd 100644 ---- a/tests/rustdoc/comment-in-doctest.rs -+++ b/tests/rustdoc/comment-in-doctest.rs -@@ -1,4 +1,5 @@ - // compile-flags:--test -+// ignore-stage1 - - // comments, both doc comments and regular ones, used to trick rustdoc's doctest parser into - // thinking that everything after it was part of the regular program. combined with the librustc_ast -diff --git a/tests/rustdoc/const-generics/const-generics-docs.rs b/tests/rustdoc/const-generics/const-generics-docs.rs -index 828486a41d4..02a934996f8 100644 ---- a/tests/rustdoc/const-generics/const-generics-docs.rs -+++ b/tests/rustdoc/const-generics/const-generics-docs.rs -@@ -1,5 +1,7 @@ - // edition:2018 - // aux-build: extern_crate.rs -+// ignore-stage1 -+ - #![crate_name = "foo"] - - extern crate extern_crate; -diff --git a/tests/rustdoc/cross-crate-hidden-assoc-trait-items.rs b/tests/rustdoc/cross-crate-hidden-assoc-trait-items.rs -index d02bc4fe712..6f432da06bf 100644 ---- a/tests/rustdoc/cross-crate-hidden-assoc-trait-items.rs -+++ b/tests/rustdoc/cross-crate-hidden-assoc-trait-items.rs -@@ -1,5 +1,6 @@ - // Regression test for issue #95717 - // Hide cross-crate `#[doc(hidden)]` associated items in trait impls. -+// ignore-stage1 - - #![crate_name = "dependent"] - // edition:2021 -diff --git a/tests/rustdoc/cross-crate-hidden-impl-parameter.rs b/tests/rustdoc/cross-crate-hidden-impl-parameter.rs -index eb2ced2f7f4..08a6f8b27f3 100644 ---- a/tests/rustdoc/cross-crate-hidden-impl-parameter.rs -+++ b/tests/rustdoc/cross-crate-hidden-impl-parameter.rs -@@ -1,4 +1,6 @@ - // Issue #86448: test for cross-crate `doc(hidden)` -+// ignore-stage1 -+ - #![crate_name = "foo"] - - // aux-build:cross-crate-hidden-impl-parameter.rs -diff --git a/tests/rustdoc/cross-crate-links.rs b/tests/rustdoc/cross-crate-links.rs -index 7c736a4cc11..a0be9a367c6 100644 ---- a/tests/rustdoc/cross-crate-links.rs -+++ b/tests/rustdoc/cross-crate-links.rs -@@ -1,5 +1,6 @@ - // aux-build:all-item-types.rs - // build-aux-docs -+// ignore-stage1 - - #![crate_name = "foo"] - -diff --git a/tests/rustdoc/cross-crate-primitive-doc.rs b/tests/rustdoc/cross-crate-primitive-doc.rs -index 4ba296ee04a..51fa62ffb53 100644 ---- a/tests/rustdoc/cross-crate-primitive-doc.rs -+++ b/tests/rustdoc/cross-crate-primitive-doc.rs -@@ -1,6 +1,7 @@ - // aux-build:primitive-doc.rs - // compile-flags: --extern-html-root-url=primitive_doc=../ -Z unstable-options - // only-linux -+// ignore-stage1 - - #![feature(no_core)] - #![no_core] -diff --git a/tests/rustdoc/doctest-manual-crate-name.rs b/tests/rustdoc/doctest-manual-crate-name.rs -index 3a5e3734e14..2b4b19b4708 100644 ---- a/tests/rustdoc/doctest-manual-crate-name.rs -+++ b/tests/rustdoc/doctest-manual-crate-name.rs -@@ -1,4 +1,5 @@ - // compile-flags:--test -+// ignore-stage1 - - //! ``` - //! #![crate_name="asdf"] -diff --git a/tests/rustdoc/edition-doctest.rs b/tests/rustdoc/edition-doctest.rs -index 6de25996bed..4acb562a29c 100644 ---- a/tests/rustdoc/edition-doctest.rs -+++ b/tests/rustdoc/edition-doctest.rs -@@ -1,4 +1,5 @@ - // compile-flags:--test -+// ignore-stage1 - - /// ```rust,edition2018 - /// #![feature(try_blocks)] -diff --git a/tests/rustdoc/edition-flag.rs b/tests/rustdoc/edition-flag.rs -index e54c7d2969b..4cee5e1a3cf 100644 ---- a/tests/rustdoc/edition-flag.rs -+++ b/tests/rustdoc/edition-flag.rs -@@ -1,5 +1,6 @@ - // compile-flags:--test - // edition:2018 -+// ignore-stage1 - - /// ```rust - /// fn main() { -diff --git a/tests/rustdoc/elided-lifetime.rs b/tests/rustdoc/elided-lifetime.rs -index 006132ef8aa..75ac6496dfb 100644 ---- a/tests/rustdoc/elided-lifetime.rs -+++ b/tests/rustdoc/elided-lifetime.rs -@@ -4,6 +4,7 @@ - // - // Since Rust 2018 we encourage writing out <'_> explicitly to make it clear - // that borrowing is occurring. Make sure rustdoc is following the same idiom. -+// ignore-stage1 - - #![crate_name = "foo"] - -diff --git a/tests/rustdoc/extern-html-root-url.rs b/tests/rustdoc/extern-html-root-url.rs -index 17eedcf2ab8..429bf78b9d5 100644 ---- a/tests/rustdoc/extern-html-root-url.rs -+++ b/tests/rustdoc/extern-html-root-url.rs -@@ -2,6 +2,7 @@ - // aux-build:html_root.rs - // aux-build:no_html_root.rs - // NOTE: intentionally does not build any auxiliary docs -+// ignore-stage1 - - extern crate html_root; - extern crate no_html_root; -diff --git a/tests/rustdoc/extern-impl-trait.rs b/tests/rustdoc/extern-impl-trait.rs -index 8ab026afd1b..c47d6802211 100644 ---- a/tests/rustdoc/extern-impl-trait.rs -+++ b/tests/rustdoc/extern-impl-trait.rs -@@ -1,4 +1,5 @@ - // aux-build:extern-impl-trait.rs -+// ignore-stage1 - - #![crate_name = "foo"] - -diff --git a/tests/rustdoc/external-macro-src.rs b/tests/rustdoc/external-macro-src.rs -index 359551ab78d..86499a0bf2e 100644 ---- a/tests/rustdoc/external-macro-src.rs -+++ b/tests/rustdoc/external-macro-src.rs -@@ -1,4 +1,5 @@ - // aux-build:external-macro-src.rs -+// ignore-stage1 - - #![crate_name = "foo"] - -diff --git a/tests/rustdoc/hide-unstable-trait.rs b/tests/rustdoc/hide-unstable-trait.rs -index 0bf7cabc43b..9ceeccfead8 100644 ---- a/tests/rustdoc/hide-unstable-trait.rs -+++ b/tests/rustdoc/hide-unstable-trait.rs -@@ -1,4 +1,5 @@ - // aux-build:unstable-trait.rs -+// ignore-stage1 - - #![crate_name = "foo"] - #![feature(private_trait)] -diff --git a/tests/rustdoc/inline_cross/add-docs.rs b/tests/rustdoc/inline_cross/add-docs.rs -index a1124d2094c..a11b866647d 100644 ---- a/tests/rustdoc/inline_cross/add-docs.rs -+++ b/tests/rustdoc/inline_cross/add-docs.rs -@@ -1,4 +1,5 @@ - // aux-build:add-docs.rs -+// ignore-stage1 - - extern crate inner; - -diff --git a/tests/rustdoc/inline_cross/default-trait-method.rs b/tests/rustdoc/inline_cross/default-trait-method.rs -index a4ec73a127d..8db38c99791 100644 ---- a/tests/rustdoc/inline_cross/default-trait-method.rs -+++ b/tests/rustdoc/inline_cross/default-trait-method.rs -@@ -1,4 +1,5 @@ - // aux-build:default-trait-method.rs -+// ignore-stage1 - - extern crate foo; - -diff --git a/tests/rustdoc/inline_cross/impl_trait.rs b/tests/rustdoc/inline_cross/impl_trait.rs -index b6a1552bc00..85377b19e0d 100644 ---- a/tests/rustdoc/inline_cross/impl_trait.rs -+++ b/tests/rustdoc/inline_cross/impl_trait.rs -@@ -1,5 +1,6 @@ - // aux-build:impl_trait_aux.rs - // edition:2018 -+// ignore-stage1 - - extern crate impl_trait_aux; - -diff --git a/tests/rustdoc/inline_cross/issue-24183.rs b/tests/rustdoc/inline_cross/issue-24183.rs -index 751a32385e8..d25211cb2b0 100644 ---- a/tests/rustdoc/inline_cross/issue-24183.rs -+++ b/tests/rustdoc/inline_cross/issue-24183.rs -@@ -1,5 +1,6 @@ - #![crate_type = "lib"] - #![crate_name = "usr"] -+// ignore-stage1 - - // aux-crate:issue_24183=issue-24183.rs - // edition: 2021 -diff --git a/tests/rustdoc/inline_cross/macros.rs b/tests/rustdoc/inline_cross/macros.rs -index a41b9c5b197..1b4bccee176 100644 ---- a/tests/rustdoc/inline_cross/macros.rs -+++ b/tests/rustdoc/inline_cross/macros.rs -@@ -1,5 +1,6 @@ - // aux-build:macros.rs - // build-aux-docs -+// ignore-stage1 - - #![feature(macro_test)] - #![crate_name = "foo"] -diff --git a/tests/rustdoc/inline_cross/trait-vis.rs b/tests/rustdoc/inline_cross/trait-vis.rs -index b646babacc5..b77e966afe3 100644 ---- a/tests/rustdoc/inline_cross/trait-vis.rs -+++ b/tests/rustdoc/inline_cross/trait-vis.rs -@@ -1,4 +1,5 @@ - // aux-build:trait-vis.rs -+// ignore-stage1 - - extern crate inner; - -diff --git a/tests/rustdoc/inline_cross/use_crate.rs b/tests/rustdoc/inline_cross/use_crate.rs -index 00e0f041c56..c5bf6010d93 100644 ---- a/tests/rustdoc/inline_cross/use_crate.rs -+++ b/tests/rustdoc/inline_cross/use_crate.rs -@@ -3,6 +3,7 @@ - // build-aux-docs - // edition:2018 - // compile-flags:--extern use_crate --extern use_crate_2 -+// ignore-stage1 - - // During the buildup to Rust 2018, rustdoc would eagerly inline `pub use some_crate;` as if it - // were a module, so we changed it to make `pub use`ing crate roots remain as a `pub use` statement -diff --git a/tests/rustdoc/intra-doc-crate/self.rs b/tests/rustdoc/intra-doc-crate/self.rs -index 8c36a7fa002..848e17a18a1 100644 ---- a/tests/rustdoc/intra-doc-crate/self.rs -+++ b/tests/rustdoc/intra-doc-crate/self.rs -@@ -1,5 +1,6 @@ - // aux-build:self.rs - // build-aux-docs -+// ignore-stage1 - - extern crate cross_crate_self; - -diff --git a/tests/rustdoc/intra-doc/cross-crate/additional_doc.rs b/tests/rustdoc/intra-doc/cross-crate/additional_doc.rs -index e52fb9b1c9f..765ad78fb4d 100644 ---- a/tests/rustdoc/intra-doc/cross-crate/additional_doc.rs -+++ b/tests/rustdoc/intra-doc/cross-crate/additional_doc.rs -@@ -1,5 +1,7 @@ - // aux-build:additional_doc.rs - // build-aux-docs -+// ignore-stage1 -+ - #![deny(rustdoc::broken_intra_doc_links)] - - extern crate my_rand; -diff --git a/tests/rustdoc/intra-doc/cross-crate/basic.rs b/tests/rustdoc/intra-doc/cross-crate/basic.rs -index ad7454918b4..a959a15a672 100644 ---- a/tests/rustdoc/intra-doc/cross-crate/basic.rs -+++ b/tests/rustdoc/intra-doc/cross-crate/basic.rs -@@ -1,5 +1,7 @@ - // aux-build:intra-doc-basic.rs - // build-aux-docs -+// ignore-stage1 -+ - #![deny(rustdoc::broken_intra_doc_links)] - - // from https://github.com/rust-lang/rust/issues/65983 -diff --git a/tests/rustdoc/intra-doc/cross-crate/crate.rs b/tests/rustdoc/intra-doc/cross-crate/crate.rs -index edf544708b6..735847bcbb5 100644 ---- a/tests/rustdoc/intra-doc/cross-crate/crate.rs -+++ b/tests/rustdoc/intra-doc/cross-crate/crate.rs -@@ -1,5 +1,7 @@ - // aux-build:intra-link-cross-crate-crate.rs - // build-aux-docs -+// ignore-stage1 -+ - #![crate_name = "outer"] - extern crate inner; - // @has outer/fn.f.html '//a[@href="../inner/fn.g.html"]' "crate::g" -diff --git a/tests/rustdoc/intra-doc/cross-crate/hidden.rs b/tests/rustdoc/intra-doc/cross-crate/hidden.rs -index 4f7d075ba48..d7ffed2d19d 100644 ---- a/tests/rustdoc/intra-doc/cross-crate/hidden.rs -+++ b/tests/rustdoc/intra-doc/cross-crate/hidden.rs -@@ -1,5 +1,7 @@ - // aux-build:hidden.rs - // build-aux-docs -+// ignore-stage1 -+ - #![deny(rustdoc::broken_intra_doc_links)] - - // tests https://github.com/rust-lang/rust/issues/73363 -diff --git a/tests/rustdoc/intra-doc/cross-crate/macro.rs b/tests/rustdoc/intra-doc/cross-crate/macro.rs -index 32f0a55d3c6..31add14b3b6 100644 ---- a/tests/rustdoc/intra-doc/cross-crate/macro.rs -+++ b/tests/rustdoc/intra-doc/cross-crate/macro.rs -@@ -1,6 +1,8 @@ - // aux-build:macro_inner.rs - // aux-build:proc_macro.rs - // build-aux-docs -+// ignore-stage1 -+ - #![deny(rustdoc::broken_intra_doc_links)] - extern crate macro_inner; - extern crate proc_macro_inner; -diff --git a/tests/rustdoc/intra-doc/cross-crate/module.rs b/tests/rustdoc/intra-doc/cross-crate/module.rs -index fde9322657d..72e55a83007 100644 ---- a/tests/rustdoc/intra-doc/cross-crate/module.rs -+++ b/tests/rustdoc/intra-doc/cross-crate/module.rs -@@ -1,6 +1,8 @@ - // outer.rs - // aux-build: module.rs - // build-aux-docs -+// ignore-stage1 -+ - #![deny(rustdoc::broken_intra_doc_links)] - extern crate module_inner; - // @has 'module/bar/index.html' '//a[@href="../../module_inner/trait.SomeTrait.html"]' 'SomeTrait' -diff --git a/tests/rustdoc/intra-doc/cross-crate/submodule-inner.rs b/tests/rustdoc/intra-doc/cross-crate/submodule-inner.rs -index 577fe78a508..1da901cd8b8 100644 ---- a/tests/rustdoc/intra-doc/cross-crate/submodule-inner.rs -+++ b/tests/rustdoc/intra-doc/cross-crate/submodule-inner.rs -@@ -1,5 +1,7 @@ - // aux-build:submodule-inner.rs - // build-aux-docs -+// ignore-stage1 -+ - #![deny(rustdoc::broken_intra_doc_links)] - - extern crate a; -diff --git a/tests/rustdoc/intra-doc/cross-crate/submodule-outer.rs b/tests/rustdoc/intra-doc/cross-crate/submodule-outer.rs -index d0c0b7e85ae..39c42c5a684 100644 ---- a/tests/rustdoc/intra-doc/cross-crate/submodule-outer.rs -+++ b/tests/rustdoc/intra-doc/cross-crate/submodule-outer.rs -@@ -1,5 +1,7 @@ - // aux-build:submodule-outer.rs - // edition:2018 -+// ignore-stage1 -+ - #![deny(rustdoc::broken_intra_doc_links)] - - extern crate bar as bar_; -diff --git a/tests/rustdoc/intra-doc/cross-crate/traits.rs b/tests/rustdoc/intra-doc/cross-crate/traits.rs -index 7b9554bfdb0..0417a5f4537 100644 ---- a/tests/rustdoc/intra-doc/cross-crate/traits.rs -+++ b/tests/rustdoc/intra-doc/cross-crate/traits.rs -@@ -1,5 +1,7 @@ - // aux-build:traits.rs - // build-aux-docs -+// ignore-stage1 -+ - #![deny(rustdoc::broken_intra_doc_links)] - - extern crate inner; -diff --git a/tests/rustdoc/intra-doc/extern-builtin-type-impl.rs b/tests/rustdoc/intra-doc/extern-builtin-type-impl.rs -index 7bb1ded3f3c..994ece708ca 100644 ---- a/tests/rustdoc/intra-doc/extern-builtin-type-impl.rs -+++ b/tests/rustdoc/intra-doc/extern-builtin-type-impl.rs -@@ -1,6 +1,7 @@ - // Reexport of a structure that derefs to a type with lang item impls having doc links in their - // comments. The doc link points to an associated item, so we check that traits in scope for that - // link are populated. -+// ignore-stage1 - - // aux-build:extern-builtin-type-impl-dep.rs - -diff --git a/tests/rustdoc/intra-doc/extern-crate-only-used-in-link.rs b/tests/rustdoc/intra-doc/extern-crate-only-used-in-link.rs -index ad50887e922..69d5aa1717a 100644 ---- a/tests/rustdoc/intra-doc/extern-crate-only-used-in-link.rs -+++ b/tests/rustdoc/intra-doc/extern-crate-only-used-in-link.rs -@@ -7,6 +7,7 @@ - // aux-crate:priv:empty2=empty2.rs - // build-aux-docs - // compile-flags:-Z unstable-options --edition 2018 -+// ignore-stage1 - - // @has extern_crate_only_used_in_link/index.html - // @has - '//a[@href="../issue_66159_1/struct.Something.html"]' 'issue_66159_1::Something' -diff --git a/tests/rustdoc/intra-doc/extern-crate.rs b/tests/rustdoc/intra-doc/extern-crate.rs -index 4e4438dea03..b6793531515 100644 ---- a/tests/rustdoc/intra-doc/extern-crate.rs -+++ b/tests/rustdoc/intra-doc/extern-crate.rs -@@ -3,6 +3,7 @@ - // When loading `extern crate` statements, we would pull in their docs at the same time, even - // though they would never actually get displayed. This tripped intra-doc-link resolution failures, - // for items that aren't under our control, and not actually getting documented! -+// ignore-stage1 - - #![deny(rustdoc::broken_intra_doc_links)] - -diff --git a/tests/rustdoc/intra-doc/extern-inherent-impl.rs b/tests/rustdoc/intra-doc/extern-inherent-impl.rs -index 2e41c2214f4..8851071adbd 100644 ---- a/tests/rustdoc/intra-doc/extern-inherent-impl.rs -+++ b/tests/rustdoc/intra-doc/extern-inherent-impl.rs -@@ -1,5 +1,6 @@ - // Reexport of a structure with public inherent impls having doc links in their comments. The doc - // link points to an associated item, so we check that traits in scope for that link are populated. -+// ignore-stage1 - - // aux-build:extern-inherent-impl-dep.rs - -diff --git a/tests/rustdoc/intra-doc/extern-reference-link.rs b/tests/rustdoc/intra-doc/extern-reference-link.rs -index bad6ec75579..43cf0c23e8b 100644 ---- a/tests/rustdoc/intra-doc/extern-reference-link.rs -+++ b/tests/rustdoc/intra-doc/extern-reference-link.rs -@@ -1,5 +1,6 @@ - // compile-flags: --extern pub_struct - // aux-build:pub-struct.rs -+// ignore-stage1 - - /// [SomeStruct] - /// -diff --git a/tests/rustdoc/intra-doc/issue-103463.rs b/tests/rustdoc/intra-doc/issue-103463.rs -index 4adf8a9a8a4..3b965529577 100644 ---- a/tests/rustdoc/intra-doc/issue-103463.rs -+++ b/tests/rustdoc/intra-doc/issue-103463.rs -@@ -1,6 +1,7 @@ - // The `Trait` is not pulled into the crate resulting in doc links in its methods being resolved. - - // aux-build:issue-103463-aux.rs -+// ignore-stage1 - - extern crate issue_103463_aux; - use issue_103463_aux::Trait; -diff --git a/tests/rustdoc/intra-doc/issue-104145.rs b/tests/rustdoc/intra-doc/issue-104145.rs -index 9ce36740d60..74c790ddd45 100644 ---- a/tests/rustdoc/intra-doc/issue-104145.rs -+++ b/tests/rustdoc/intra-doc/issue-104145.rs -@@ -1,6 +1,7 @@ - // Doc links in `Trait`'s methods are resolved because it has a local impl. - - // aux-build:issue-103463-aux.rs -+// ignore-stage1 - - extern crate issue_103463_aux; - use issue_103463_aux::Trait; -diff --git a/tests/rustdoc/intra-doc/issue-66159.rs b/tests/rustdoc/intra-doc/issue-66159.rs -index 56742b39790..64ef5f3d07c 100644 ---- a/tests/rustdoc/intra-doc/issue-66159.rs -+++ b/tests/rustdoc/intra-doc/issue-66159.rs -@@ -1,5 +1,6 @@ - // aux-crate:priv:pub_struct=pub-struct.rs - // compile-flags:-Z unstable-options -+// ignore-stage1 - - // The issue was an ICE which meant that we never actually generated the docs - // so if we have generated the docs, we're okay. -diff --git a/tests/rustdoc/intra-doc/pub-use.rs b/tests/rustdoc/intra-doc/pub-use.rs -index 8a998496cf5..26109bc52fc 100644 ---- a/tests/rustdoc/intra-doc/pub-use.rs -+++ b/tests/rustdoc/intra-doc/pub-use.rs -@@ -1,4 +1,5 @@ - // aux-build: intra-link-pub-use.rs -+// ignore-stage1 - #![deny(rustdoc::broken_intra_doc_links)] - #![crate_name = "outer"] - -diff --git a/tests/rustdoc/intra-doc/reexport-additional-docs.rs b/tests/rustdoc/intra-doc/reexport-additional-docs.rs -index 64683bacd65..6ed63e4dd26 100644 ---- a/tests/rustdoc/intra-doc/reexport-additional-docs.rs -+++ b/tests/rustdoc/intra-doc/reexport-additional-docs.rs -@@ -1,5 +1,7 @@ - // aux-build:intra-link-reexport-additional-docs.rs - // build-aux-docs -+// ignore-stage1 -+ - #![crate_name = "foo"] - extern crate inner; - -diff --git a/tests/rustdoc/issue-18199.rs b/tests/rustdoc/issue-18199.rs -index bc0c4a56502..1995fd2ec7d 100644 ---- a/tests/rustdoc/issue-18199.rs -+++ b/tests/rustdoc/issue-18199.rs -@@ -1,4 +1,5 @@ - // compile-flags:--test -+// ignore-stage1 - - #![doc(test(attr(feature(staged_api))))] - -diff --git a/tests/rustdoc/issue-23106.rs b/tests/rustdoc/issue-23106.rs -index 8cda2fc3380..e7b5c1e28c5 100644 ---- a/tests/rustdoc/issue-23106.rs -+++ b/tests/rustdoc/issue-23106.rs -@@ -1,4 +1,5 @@ - // compile-flags:--test -+// ignore-stage1 - - /// ``` - /// # -diff --git a/tests/rustdoc/issue-23744.rs b/tests/rustdoc/issue-23744.rs -index 642817396b2..780b131a842 100644 ---- a/tests/rustdoc/issue-23744.rs -+++ b/tests/rustdoc/issue-23744.rs -@@ -1,4 +1,5 @@ - // compile-flags:--test -+// ignore-stage1 - - /// Example of rustdoc incorrectly parsing <code>```rust,should_panic</code>. - /// -diff --git a/tests/rustdoc/issue-25944.rs b/tests/rustdoc/issue-25944.rs -index 49625294bbe..b6df4518de4 100644 ---- a/tests/rustdoc/issue-25944.rs -+++ b/tests/rustdoc/issue-25944.rs -@@ -1,4 +1,5 @@ - // compile-flags:--test -+// ignore-stage1 - - /// ``` - /// let a = r#" -diff --git a/tests/rustdoc/issue-30252.rs b/tests/rustdoc/issue-30252.rs -index c3777362a66..a80f92dc754 100644 ---- a/tests/rustdoc/issue-30252.rs -+++ b/tests/rustdoc/issue-30252.rs -@@ -1,4 +1,5 @@ - // compile-flags:--test --cfg feature="bar" -+// ignore-stage1 - - /// ```rust - /// assert_eq!(cfg!(feature = "bar"), true); -diff --git a/tests/rustdoc/issue-38129.rs b/tests/rustdoc/issue-38129.rs -index 156d50fa52a..60ab5dd1885 100644 ---- a/tests/rustdoc/issue-38129.rs -+++ b/tests/rustdoc/issue-38129.rs -@@ -1,4 +1,5 @@ - // compile-flags:--test -+// ignore-stage1 - - // This file tests the source-partitioning behavior of rustdoc. - // Each test contains some code that should be put into the generated -diff --git a/tests/rustdoc/issue-40936.rs b/tests/rustdoc/issue-40936.rs -index 4d2e4c17b1f..8dcfc4068d3 100644 ---- a/tests/rustdoc/issue-40936.rs -+++ b/tests/rustdoc/issue-40936.rs -@@ -1,5 +1,6 @@ - // aux-build:issue-40936.rs - // build-aux-docs -+// ignore-stage1 - - #![crate_name = "foo"] - -diff --git a/tests/rustdoc/issue-43153.rs b/tests/rustdoc/issue-43153.rs -index 0fe680f10af..8c67d64826a 100644 ---- a/tests/rustdoc/issue-43153.rs -+++ b/tests/rustdoc/issue-43153.rs -@@ -1,5 +1,6 @@ - // Test that `include!` in a doc test searches relative to the directory in - // which the test is declared. -+// ignore-stage1 - - // compile-flags:--test - -diff --git a/tests/rustdoc/issue-46727.rs b/tests/rustdoc/issue-46727.rs -index 8cfc4827a7f..55f155e0219 100644 ---- a/tests/rustdoc/issue-46727.rs -+++ b/tests/rustdoc/issue-46727.rs -@@ -1,4 +1,5 @@ - // aux-build:issue-46727.rs -+// ignore-stage1 - - extern crate issue_46727; - -diff --git a/tests/rustdoc/issue-48377.rs b/tests/rustdoc/issue-48377.rs -index c32bcf380ea..c196b77a3e7 100644 ---- a/tests/rustdoc/issue-48377.rs -+++ b/tests/rustdoc/issue-48377.rs -@@ -1,4 +1,5 @@ - // compile-flags:--test -+// ignore-stage1 - - //! This is a doc comment - //! -diff --git a/tests/rustdoc/issue-48414.rs b/tests/rustdoc/issue-48414.rs -index b35743d887b..e8ade910228 100644 ---- a/tests/rustdoc/issue-48414.rs -+++ b/tests/rustdoc/issue-48414.rs -@@ -1,4 +1,5 @@ - // aux-build:issue-48414.rs -+// ignore-stage1 - - // ICE when resolving paths for a trait that linked to another trait, when both were in an external - // crate -diff --git a/tests/rustdoc/issue-53689.rs b/tests/rustdoc/issue-53689.rs -index 832140e061b..9a40ea6bc1b 100644 ---- a/tests/rustdoc/issue-53689.rs -+++ b/tests/rustdoc/issue-53689.rs -@@ -1,4 +1,5 @@ - // aux-build:issue-53689.rs -+// ignore-stage1 - - #![crate_name = "foo"] - -diff --git a/tests/rustdoc/issue-54478-demo-allocator.rs b/tests/rustdoc/issue-54478-demo-allocator.rs -index 4811f363bc9..f4d12f6f630 100644 ---- a/tests/rustdoc/issue-54478-demo-allocator.rs -+++ b/tests/rustdoc/issue-54478-demo-allocator.rs -@@ -1,5 +1,6 @@ - // Issue #54478: regression test showing that we can demonstrate - // `#[global_allocator]` in code blocks built by `rustdoc`. -+// ignore-stage1 - // - // ## Background - // -@@ -11,6 +12,7 @@ - // Rather than try to revise the visbility semanics, we instead - // decided to change `rustdoc` to behave more like the compiler's - // default setting, by leaving off `-C prefer-dynamic`. -+// ignore-stage1 - - // compile-flags:--test - -diff --git a/tests/rustdoc/issue-57180.rs b/tests/rustdoc/issue-57180.rs -index 14bd2b0fec0..5f89e5d42f5 100644 ---- a/tests/rustdoc/issue-57180.rs -+++ b/tests/rustdoc/issue-57180.rs -@@ -1,4 +1,5 @@ - // aux-build:issue-57180.rs -+// ignore-stage1 - - extern crate issue_57180; - use issue_57180::Trait; -diff --git a/tests/rustdoc/issue-61592.rs b/tests/rustdoc/issue-61592.rs -index 4b6c37b94aa..048487390bb 100644 ---- a/tests/rustdoc/issue-61592.rs -+++ b/tests/rustdoc/issue-61592.rs -@@ -1,4 +1,5 @@ - // aux-build:issue-61592.rs -+// ignore-stage1 - - extern crate foo; - -diff --git a/tests/rustdoc/issue-73061-cross-crate-opaque-assoc-type.rs b/tests/rustdoc/issue-73061-cross-crate-opaque-assoc-type.rs -index 2700f2370ee..d883c03d7d2 100644 ---- a/tests/rustdoc/issue-73061-cross-crate-opaque-assoc-type.rs -+++ b/tests/rustdoc/issue-73061-cross-crate-opaque-assoc-type.rs -@@ -1,4 +1,5 @@ - // Regression test for ICE #73061 -+// ignore-stage1 - - // aux-build:issue-73061.rs - -diff --git a/tests/rustdoc/issue-75588.rs b/tests/rustdoc/issue-75588.rs -index 3b11059a755..e78cdfa236e 100644 ---- a/tests/rustdoc/issue-75588.rs -+++ b/tests/rustdoc/issue-75588.rs -@@ -1,5 +1,6 @@ - // aux-build:realcore.rs - // aux-build:real_gimli.rs -+// ignore-stage1 - - // Ensure unstably exported traits have their Implementors sections. - -diff --git a/tests/rustdoc/issue-85454.rs b/tests/rustdoc/issue-85454.rs -index 5a49a9d0651..fd2f4f8b535 100644 ---- a/tests/rustdoc/issue-85454.rs -+++ b/tests/rustdoc/issue-85454.rs -@@ -1,4 +1,5 @@ - // aux-build:issue-85454.rs -+// ignore-stage1 - // build-aux-docs - #![crate_name = "foo"] - -diff --git a/tests/rustdoc/issue-86620.rs b/tests/rustdoc/issue-86620.rs -index ef15946ec50..675a12b4d14 100644 ---- a/tests/rustdoc/issue-86620.rs -+++ b/tests/rustdoc/issue-86620.rs -@@ -1,4 +1,5 @@ - // aux-build:issue-86620-1.rs -+// ignore-stage1 - - extern crate issue_86620_1; - -diff --git a/tests/rustdoc/macro_pub_in_module.rs b/tests/rustdoc/macro_pub_in_module.rs -index 42f760cff6a..1a51aef9a8a 100644 ---- a/tests/rustdoc/macro_pub_in_module.rs -+++ b/tests/rustdoc/macro_pub_in_module.rs -@@ -1,5 +1,6 @@ - // aux-build:macro_pub_in_module.rs - // edition:2018 -+// ignore-stage1 - // build-aux-docs - - //! See issue #74355 -diff --git a/tests/rustdoc/masked.rs b/tests/rustdoc/masked.rs -index 875c026fd05..416d8fbabd0 100644 ---- a/tests/rustdoc/masked.rs -+++ b/tests/rustdoc/masked.rs -@@ -1,4 +1,5 @@ - // aux-build:masked.rs -+// ignore-stage1 - - #![feature(doc_masked)] - -diff --git a/tests/rustdoc/no-stack-overflow-25295.rs b/tests/rustdoc/no-stack-overflow-25295.rs -index dd79f1e4baa..0bc58afa4cb 100644 ---- a/tests/rustdoc/no-stack-overflow-25295.rs -+++ b/tests/rustdoc/no-stack-overflow-25295.rs -@@ -1,5 +1,6 @@ - // Ensure this code doesn't stack overflow. - // aux-build:enum-primitive.rs -+// ignore-stage1 - - #[macro_use] extern crate enum_primitive; - -diff --git a/tests/rustdoc/normalize-assoc-item.rs b/tests/rustdoc/normalize-assoc-item.rs -index c6fd5e1101e..945a31853f4 100644 ---- a/tests/rustdoc/normalize-assoc-item.rs -+++ b/tests/rustdoc/normalize-assoc-item.rs -@@ -1,4 +1,5 @@ - // ignore-tidy-linelength -+// ignore-stage1 - // aux-build:normalize-assoc-item.rs - // build-aux-docs - // compile-flags:-Znormalize-docs -diff --git a/tests/rustdoc/primitive-reexport.rs b/tests/rustdoc/primitive-reexport.rs -index 10a8a47db52..ecdb4848265 100644 ---- a/tests/rustdoc/primitive-reexport.rs -+++ b/tests/rustdoc/primitive-reexport.rs -@@ -1,5 +1,6 @@ - // aux-build: primitive-reexport.rs - // compile-flags:--extern foo --edition 2018 -+// ignore-stage1 - - #![crate_name = "bar"] - -diff --git a/tests/rustdoc/process-termination.rs b/tests/rustdoc/process-termination.rs -index 32258792b6e..2236842afc9 100644 ---- a/tests/rustdoc/process-termination.rs -+++ b/tests/rustdoc/process-termination.rs -@@ -1,4 +1,5 @@ - // compile-flags:--test -+// ignore-stage1 - - /// A check of using various process termination strategies - /// -diff --git a/tests/rustdoc/pub-extern-crate.rs b/tests/rustdoc/pub-extern-crate.rs -index 26747a4d1ac..98b3068cfd5 100644 ---- a/tests/rustdoc/pub-extern-crate.rs -+++ b/tests/rustdoc/pub-extern-crate.rs -@@ -1,4 +1,5 @@ - // aux-build:pub-extern-crate.rs -+// ignore-stage1 - - // @has pub_extern_crate/index.html - // @!has - '//code' 'pub extern crate inner' -diff --git a/tests/rustdoc/pub-use-extern-macros.rs b/tests/rustdoc/pub-use-extern-macros.rs -index eefe6b4b073..f67ec499459 100644 ---- a/tests/rustdoc/pub-use-extern-macros.rs -+++ b/tests/rustdoc/pub-use-extern-macros.rs -@@ -1,4 +1,5 @@ - // aux-build:pub-use-extern-macros.rs -+// ignore-stage1 - - extern crate macros; - -diff --git a/tests/rustdoc/reexport-check.rs b/tests/rustdoc/reexport-check.rs -index 5908d2150f2..9e3c825558e 100644 ---- a/tests/rustdoc/reexport-check.rs -+++ b/tests/rustdoc/reexport-check.rs -@@ -1,4 +1,6 @@ - // aux-build:reexport-check.rs -+// ignore-stage1 -+ - #![crate_name = "foo"] - - extern crate reexport_check; -diff --git a/tests/rustdoc/reexport-dep-foreign-fn.rs b/tests/rustdoc/reexport-dep-foreign-fn.rs -index e7f5720d583..f09e2da12f8 100644 ---- a/tests/rustdoc/reexport-dep-foreign-fn.rs -+++ b/tests/rustdoc/reexport-dep-foreign-fn.rs -@@ -1,4 +1,5 @@ - // aux-build:all-item-types.rs -+// ignore-stage1 - - // This test is to ensure there is no problem on handling foreign functions - // coming from a dependency. -diff --git a/tests/rustdoc/reexport-doc.rs b/tests/rustdoc/reexport-doc.rs -index df2c889b4d5..52558b39068 100644 ---- a/tests/rustdoc/reexport-doc.rs -+++ b/tests/rustdoc/reexport-doc.rs -@@ -1,4 +1,5 @@ - // aux-build:reexport-doc-aux.rs -+// ignore-stage1 - - extern crate reexport_doc_aux as dep; - -diff --git a/tests/rustdoc/reexports-priv.rs b/tests/rustdoc/reexports-priv.rs -index 571d7f06fdc..bec1096ad14 100644 ---- a/tests/rustdoc/reexports-priv.rs -+++ b/tests/rustdoc/reexports-priv.rs -@@ -1,4 +1,5 @@ - // aux-build: reexports.rs -+// ignore-stage1 - // compile-flags: --document-private-items - - #![crate_name = "foo"] -diff --git a/tests/rustdoc/reexports.rs b/tests/rustdoc/reexports.rs -index 3c51ac395af..018abbfd277 100644 ---- a/tests/rustdoc/reexports.rs -+++ b/tests/rustdoc/reexports.rs -@@ -1,4 +1,5 @@ - // aux-build: reexports.rs -+// ignore-stage1 - - #![crate_name = "foo"] - -diff --git a/tests/rustdoc/rustc-incoherent-impls.rs b/tests/rustdoc/rustc-incoherent-impls.rs -index 3fdefbecc54..c8382a50679 100644 ---- a/tests/rustdoc/rustc-incoherent-impls.rs -+++ b/tests/rustdoc/rustc-incoherent-impls.rs -@@ -1,4 +1,5 @@ - // aux-build:incoherent-impl-types.rs -+// ignore-stage1 - // build-aux-docs - - #![crate_name = "foo"] -diff --git a/tests/rustdoc/test_option_check/bar.rs b/tests/rustdoc/test_option_check/bar.rs -index 50a182cf7e0..6f48c9c923b 100644 ---- a/tests/rustdoc/test_option_check/bar.rs -+++ b/tests/rustdoc/test_option_check/bar.rs -@@ -1,5 +1,6 @@ - // compile-flags: --test - // check-test-line-numbers-match -+// ignore-stage1 - - /// This looks like another awesome test! - /// -diff --git a/tests/rustdoc/test_option_check/test.rs b/tests/rustdoc/test_option_check/test.rs -index 964e8e37ed5..208bccafe4c 100644 ---- a/tests/rustdoc/test_option_check/test.rs -+++ b/tests/rustdoc/test_option_check/test.rs -@@ -1,4 +1,5 @@ - // compile-flags: --test -+// ignore-stage1 - // check-test-line-numbers-match - - pub mod bar; -diff --git a/tests/rustdoc/trait-alias-mention.rs b/tests/rustdoc/trait-alias-mention.rs -index 6da0dc68785..8916e1321c7 100644 ---- a/tests/rustdoc/trait-alias-mention.rs -+++ b/tests/rustdoc/trait-alias-mention.rs -@@ -1,5 +1,6 @@ - // aux-build:trait-alias-mention.rs - // build-aux-docs -+// ignore-stage1 - - #![crate_name = "foo"] - -diff --git a/tests/rustdoc/trait-visibility.rs b/tests/rustdoc/trait-visibility.rs -index 8ba3ee03a74..9bd62dd5c0a 100644 ---- a/tests/rustdoc/trait-visibility.rs -+++ b/tests/rustdoc/trait-visibility.rs -@@ -1,4 +1,5 @@ - // aux-build:trait-visibility.rs -+// ignore-stage1 - - #![crate_name = "foo"] - -diff --git a/tests/rustdoc/unit-return.rs b/tests/rustdoc/unit-return.rs -index 6ddfa0c4d5c..a144308a581 100644 ---- a/tests/rustdoc/unit-return.rs -+++ b/tests/rustdoc/unit-return.rs -@@ -1,4 +1,5 @@ - // aux-build:unit-return.rs -+// ignore-stage1 - - #![crate_name = "foo"] - -diff --git a/tests/ui-fulldeps/deriving-encodable-decodable-box.rs b/tests/ui-fulldeps/deriving-encodable-decodable-box.rs -index 1c376f59e51..8f852db5efd 100644 ---- a/tests/ui-fulldeps/deriving-encodable-decodable-box.rs -+++ b/tests/ui-fulldeps/deriving-encodable-decodable-box.rs -@@ -1,4 +1,5 @@ - // run-pass -+// ignore-stage1 - - #![allow(unused_imports)] - #![feature(rustc_private)] -diff --git a/tests/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs b/tests/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs -index 844d40f2ecd..d0d530ac79f 100644 ---- a/tests/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs -+++ b/tests/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs -@@ -1,4 +1,5 @@ - // run-pass -+// ignore-stage1 - - #![allow(unused_imports)] - // This briefly tests the capability of `Cell` and `RefCell` to implement the -diff --git a/tests/ui-fulldeps/deriving-global.rs b/tests/ui-fulldeps/deriving-global.rs -index 214bb4368ff..7ff6e31f09e 100644 ---- a/tests/ui-fulldeps/deriving-global.rs -+++ b/tests/ui-fulldeps/deriving-global.rs -@@ -1,4 +1,5 @@ - // run-pass -+// ignore-stage1 - - #![feature(rustc_private)] - -diff --git a/tests/ui-fulldeps/deriving-hygiene.rs b/tests/ui-fulldeps/deriving-hygiene.rs -index e1084a08fec..f18b703116a 100644 ---- a/tests/ui-fulldeps/deriving-hygiene.rs -+++ b/tests/ui-fulldeps/deriving-hygiene.rs -@@ -1,4 +1,5 @@ - // run-pass -+// ignore-stage1 - - #![allow(non_upper_case_globals)] - #![feature(rustc_private)] -diff --git a/tests/ui-fulldeps/dropck_tarena_sound_drop.rs b/tests/ui-fulldeps/dropck_tarena_sound_drop.rs -index ffad80171da..d60062be118 100644 ---- a/tests/ui-fulldeps/dropck_tarena_sound_drop.rs -+++ b/tests/ui-fulldeps/dropck_tarena_sound_drop.rs -@@ -1,4 +1,5 @@ - // run-pass -+// ignore-stage1 - - #![allow(unknown_lints)] - // Check that an arena (TypedArena) can carry elements whose drop -diff --git a/tests/ui-fulldeps/empty-struct-braces-derive.rs b/tests/ui-fulldeps/empty-struct-braces-derive.rs -index 10e8beaa7b1..29419f97aa1 100644 ---- a/tests/ui-fulldeps/empty-struct-braces-derive.rs -+++ b/tests/ui-fulldeps/empty-struct-braces-derive.rs -@@ -1,5 +1,6 @@ - // run-pass - // `#[derive(Trait)]` works for empty structs/variants with braces or parens. -+// ignore-stage1 - - #![feature(rustc_private)] - -diff --git a/tests/ui-fulldeps/issue-14021.rs b/tests/ui-fulldeps/issue-14021.rs -index 309b5c4a03d..5b9fb023d85 100644 ---- a/tests/ui-fulldeps/issue-14021.rs -+++ b/tests/ui-fulldeps/issue-14021.rs -@@ -1,4 +1,5 @@ - // run-pass -+// ignore-stage1 - - #![allow(unused_mut)] - #![allow(unused_imports)] -diff --git a/tests/ui-fulldeps/regions-mock-tcx.rs b/tests/ui-fulldeps/regions-mock-tcx.rs -index 63975ef62c5..24e008bb76b 100644 ---- a/tests/ui-fulldeps/regions-mock-tcx.rs -+++ b/tests/ui-fulldeps/regions-mock-tcx.rs -@@ -1,4 +1,5 @@ - // run-pass -+// ignore-stage1 - - #![allow(dead_code)] - #![allow(unused_imports)] -diff --git a/tests/ui-fulldeps/rustc_encodable_hygiene.rs b/tests/ui-fulldeps/rustc_encodable_hygiene.rs -index 509a6b1d22c..ab5f4aed548 100644 ---- a/tests/ui-fulldeps/rustc_encodable_hygiene.rs -+++ b/tests/ui-fulldeps/rustc_encodable_hygiene.rs -@@ -1,4 +1,5 @@ - // run-pass -+// ignore-stage1 - - #![feature(rustc_private)] - -diff --git a/tests/run-make/cdylib-fewer-symbols/foo.rs b/tests/run-make/cdylib-fewer-symbols/foo.rs -index af37bc8e953..2f080fb37b2 100644 ---- a/tests/run-make/cdylib-fewer-symbols/foo.rs -+++ b/tests/run-make/cdylib-fewer-symbols/foo.rs -@@ -1,5 +1,5 @@ - #![crate_type = "cdylib"] -- -+#[ignore] - #[no_mangle] - pub extern "C" fn foo() -> u32 { - 3 -diff --git a/tests/run-make/doctests-keep-binaries/t.rs b/tests/run-make/doctests-keep-binaries/t.rs -index c38cf0a0b25..13b89c05e03 100644 ---- a/tests/run-make/doctests-keep-binaries/t.rs -+++ b/tests/run-make/doctests-keep-binaries/t.rs -@@ -1,3 +1,4 @@ -+// ignore-stage1 - /// Fungle the foople. - /// ``` - /// t::foople(); -diff --git a/tests/rustdoc-ui/doctest-multiline-crate-attribute.rs b/tests/rustdoc-ui/doctest-multiline-crate-attribute.rs -index 260f5a7a64f..c05f9adf46b 100644 ---- a/tests/rustdoc-ui/doctest-multiline-crate-attribute.rs -+++ b/tests/rustdoc-ui/doctest-multiline-crate-attribute.rs -@@ -2,6 +2,7 @@ - // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" - // check-pass -+// ignore-stage1 - - /// ``` - /// #![deprecated(since = "5.2", note = "foo was rarely used. \ -diff --git a/tests/rustdoc-ui/issue-80992.rs b/tests/rustdoc-ui/issue-80992.rs -index 80ff225b879..e589999ae29 100644 ---- a/tests/rustdoc-ui/issue-80992.rs -+++ b/tests/rustdoc-ui/issue-80992.rs -@@ -2,6 +2,7 @@ - // compile-flags:--test - // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" -+// ignore-stage1 - - pub fn test() -> Result<(), ()> { - //! ```compile_fail -diff --git a/tests/rustdoc-ui/no-run-flag.rs b/tests/rustdoc-ui/no-run-flag.rs -index 181730eb416..33fa85d7d9d 100644 ---- a/tests/rustdoc-ui/no-run-flag.rs -+++ b/tests/rustdoc-ui/no-run-flag.rs -@@ -4,6 +4,7 @@ - // compile-flags:-Z unstable-options --test --no-run --test-args=--test-threads=1 - // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" -+// ignore-stage1 - - /// ``` - /// let a = true; -diff --git a/tests/rustdoc-ui/nocapture-fail.rs b/tests/rustdoc-ui/nocapture-fail.rs -index 9a3fb592c63..9899183cdf6 100644 ---- a/tests/rustdoc-ui/nocapture-fail.rs -+++ b/tests/rustdoc-ui/nocapture-fail.rs -@@ -3,6 +3,7 @@ - // normalize-stderr-test: "tests/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" -+// ignore-stage1 - - /// ```compile_fail - /// fn foo() { -diff --git a/tests/run-make/issue-22131/foo.rs b/tests/run-make/issue-22131/foo.rs -index 33255d76879..56ffc4224e4 100644 ---- a/tests/run-make/issue-22131/foo.rs -+++ b/tests/run-make/issue-22131/foo.rs -@@ -1,5 +1,6 @@ - /// ```rust - /// assert_eq!(foo::foo(), 1); - /// ``` -+// ignore-stage1 - #[cfg(feature = "bar")] - pub fn foo() -> i32 { 1 } -diff --git a/tests/rustdoc/auto-traits.rs b/tests/rustdoc/auto-traits.rs -index 93d4bf2f656..b0eb5f1af7c 100644 ---- a/tests/rustdoc/auto-traits.rs -+++ b/tests/rustdoc/auto-traits.rs -@@ -1,4 +1,5 @@ - // aux-build:auto-traits.rs -+// ignore-stage1 - - #![feature(auto_traits)] - -diff --git a/tests/rustdoc/inline_cross/dyn_trait.rs b/tests/rustdoc/inline_cross/dyn_trait.rs -index 649d98f7139..82f88a4713c 100644 ---- a/tests/rustdoc/inline_cross/dyn_trait.rs -+++ b/tests/rustdoc/inline_cross/dyn_trait.rs -@@ -1,4 +1,5 @@ - #![crate_name = "user"] -+// ignore-stage1 - - // aux-crate:dyn_trait=dyn_trait.rs - // edition:2021 -diff --git a/tests/ui/abi/stack-probes-lto.rs b/tests/ui/abi/stack-probes-lto.rs -index 0dccb633df9..36e4d04ccaa 100644 ---- a/tests/ui/abi/stack-probes-lto.rs -+++ b/tests/ui/abi/stack-probes-lto.rs -@@ -13,6 +13,7 @@ - // ignore-fuchsia no exception handler registered for segfault - // compile-flags: -C lto - // no-prefer-dynamic -+// ignore-stage1 - // ignore-nto Crash analysis impossible at SIGSEGV in QNX Neutrino - - include!("stack-probes.rs"); -diff --git a/tests/ui/abi/stack-probes.rs b/tests/ui/abi/stack-probes.rs -index 8137c92304d..9f4edca3caf 100644 ---- a/tests/ui/abi/stack-probes.rs -+++ b/tests/ui/abi/stack-probes.rs -@@ -11,6 +11,7 @@ - // ignore-sgx no processes - // ignore-fuchsia no exception handler registered for segfault - // ignore-nto Crash analysis impossible at SIGSEGV in QNX Neutrino -+// ignore-stage1 - - use std::env; - use std::mem::MaybeUninit; -diff --git a/tests/ui/array-slice-vec/subslice-patterns-const-eval-match.rs b/tests/ui/array-slice-vec/subslice-patterns-const-eval-match.rs -index 5a6283e9f13..c036f7f03e6 100644 ---- a/tests/ui/array-slice-vec/subslice-patterns-const-eval-match.rs -+++ b/tests/ui/array-slice-vec/subslice-patterns-const-eval-match.rs -@@ -1,7 +1,7 @@ - // Test that slice subslice patterns are correctly handled in const evaluation. - - // run-pass -- -+// ignore-stage1 - #[derive(PartialEq, Debug, Clone)] - struct N(u8); - -diff --git a/tests/ui/asm/x86_64/sym.rs b/tests/ui/asm/x86_64/sym.rs -index 93ef4f09062..6b076924bda 100644 ---- a/tests/ui/asm/x86_64/sym.rs -+++ b/tests/ui/asm/x86_64/sym.rs -@@ -2,6 +2,7 @@ - // only-linux - // needs-asm-support - // run-pass -+// ignore-stage1 - - #![feature(thread_local)] - -diff --git a/tests/ui/associated-type-bounds/fn-apit.rs b/tests/ui/associated-type-bounds/fn-apit.rs -index 3c9f511338f..e8fd5fc3c3e 100644 ---- a/tests/ui/associated-type-bounds/fn-apit.rs -+++ b/tests/ui/associated-type-bounds/fn-apit.rs -@@ -1,6 +1,6 @@ - // run-pass - // aux-build:fn-aux.rs -- -+// ignore-stage1 - #![allow(unused)] - #![feature(associated_type_bounds)] - -diff --git a/tests/ui/associated-type-bounds/fn-dyn-apit.rs b/tests/ui/associated-type-bounds/fn-dyn-apit.rs -index c4e8092c211..7c690f42846 100644 ---- a/tests/ui/associated-type-bounds/fn-dyn-apit.rs -+++ b/tests/ui/associated-type-bounds/fn-dyn-apit.rs -@@ -1,6 +1,7 @@ - // run-pass - // aux-build:fn-dyn-aux.rs - -+// ignore-stage1 - #![allow(unused)] - #![feature(associated_type_bounds)] - -diff --git a/tests/ui/associated-type-bounds/fn-wrap-apit.rs b/tests/ui/associated-type-bounds/fn-wrap-apit.rs -index 96df13e372a..b1df6e867f2 100644 ---- a/tests/ui/associated-type-bounds/fn-wrap-apit.rs -+++ b/tests/ui/associated-type-bounds/fn-wrap-apit.rs -@@ -1,6 +1,7 @@ - // run-pass - // aux-build:fn-aux.rs - -+// ignore-stage1 - #![feature(associated_type_bounds)] - #![allow(dead_code)] - -diff --git a/tests/ui/structs-enums/multiple-reprs.rs b/tests/ui/structs-enums/multiple-reprs.rs -index 4be503a0ef4..2cf0875fc5c 100644 ---- a/tests/ui/structs-enums/multiple-reprs.rs -+++ b/tests/ui/structs-enums/multiple-reprs.rs -@@ -1,4 +1,5 @@ - // run-pass -+// ignore-stage1 - - #![allow(dead_code)] - -diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs ---- a/src/tools/compiletest/src/common.rs -+++ b/src/tools/compiletest/src/common.rs -@@ -431,7 +431,6 @@ - .unwrap() - }; - -- let mut current = None; - let mut all_targets = HashSet::new(); - let mut all_archs = HashSet::new(); - let mut all_oses = HashSet::new(); -@@ -452,14 +451,11 @@ - } - all_pointer_widths.insert(format!("{}bit", cfg.pointer_width)); - -- if target == config.target { -- current = Some(cfg); -- } - all_targets.insert(target.into()); - } - - Self { -- current: current.expect("current target not found"), -+ current: Self::get_current_target_config(config), - all_targets, - all_archs, - all_oses, -@@ -471,6 +467,89 @@ - } - } - -+ fn get_current_target_config(config: &Config) -> TargetCfg { -+ let mut arch = None; -+ let mut os = None; -+ let mut env = None; -+ let mut abi = None; -+ let mut families = Vec::new(); -+ let mut pointer_width = None; -+ let mut endian = None; -+ let mut panic = None; -+ -+ for config in -+ rustc_output(config, &["--print=cfg", "--target", &config.target]).trim().lines() -+ { -+ let (name, value) = config -+ .split_once("=\"") -+ .map(|(name, value)| { -+ ( -+ name, -+ Some( -+ value -+ .strip_suffix("\"") -+ .expect("key-value pair should be properly quoted"), -+ ), -+ ) -+ }) -+ .unwrap_or_else(|| (config, None)); -+ -+ match name { -+ "target_arch" => { -+ arch = Some(value.expect("target_arch should be a key-value pair").to_string()); -+ } -+ "target_os" => { -+ os = Some(value.expect("target_os sould be a key-value pair").to_string()); -+ } -+ "target_env" => { -+ env = Some(value.expect("target_env should be a key-value pair").to_string()); -+ } -+ "target_abi" => { -+ abi = Some(value.expect("target_abi should be a key-value pair").to_string()); -+ } -+ "target_family" => { -+ families -+ .push(value.expect("target_family should be a key-value pair").to_string()); -+ } -+ "target_pointer_width" => { -+ pointer_width = Some( -+ value -+ .expect("target_pointer_width should be a key-value pair") -+ .parse::<u32>() -+ .expect("target_pointer_width should be a valid u32"), -+ ); -+ } -+ "target_endian" => { -+ endian = Some(match value.expect("target_endian should be a key-value pair") { -+ "big" => Endian::Big, -+ "little" => Endian::Little, -+ _ => panic!("target_endian should be either 'big' or 'little'"), -+ }); -+ } -+ "panic" => { -+ panic = Some(match value.expect("panic should be a key-value pair") { -+ "abort" => PanicStrategy::Abort, -+ "unwind" => PanicStrategy::Unwind, -+ _ => panic!("panic should be either 'abort' or 'unwind'"), -+ }); -+ } -+ _ => (), -+ } -+ } -+ -+ TargetCfg { -+ arch: arch.expect("target configuration should specify target_arch"), -+ os: os.expect("target configuration should specify target_os"), -+ env: env.expect("target configuration should specify target_env"), -+ abi: abi.expect("target configuration should specify target_abi"), -+ families, -+ pointer_width: pointer_width -+ .expect("target configuration should specify target_pointer_width"), -+ endian: endian.expect("target configuration should specify target_endian"), -+ panic: panic.expect("target configuration should specify panic"), -+ } -+ } -+ - // #[cfg(bootstrap)] - // Needed only for one cycle, remove during the bootstrap bump. - fn collect_all_slow(config: &Config) -> HashMap<String, TargetCfg> { -diff --git a/tests/run-make/issue-47551/Makefile b/tests/run-make/issue-47551/Makefile -index 5a6ac725701..9290f2e0555 100644 ---- a/tests/run-make/issue-47551/Makefile -+++ b/tests/run-make/issue-47551/Makefile -@@ -1,3 +1,4 @@ -+# ignore-stage1 - # only-linux - # ignore-32bit - -diff --git a/tests/run-make/pgo-branch-weights/Makefile b/tests/run-make/pgo-branch-weights/Makefile -index c60206a1f34..4666be03b85 100644 ---- a/tests/run-make/pgo-branch-weights/Makefile -+++ b/tests/run-make/pgo-branch-weights/Makefile -@@ -1,3 +1,4 @@ -+# ignore-stage1 - # needs-profiler-support - # ignore-windows-gnu - -diff --git a/tests/run-make/pgo-gen-lto/Makefile b/tests/run-make/pgo-gen-lto/Makefile -index 3f2f6a838b5..9e4f555d21c 100644 ---- a/tests/run-make/pgo-gen-lto/Makefile -+++ b/tests/run-make/pgo-gen-lto/Makefile -@@ -1,3 +1,4 @@ -+# ignore-stage1 - # needs-profiler-support - # ignore-windows-gnu - -diff --git a/tests/run-make/pgo-gen/Makefile b/tests/run-make/pgo-gen/Makefile -index 4623a74957b..22aed059cf4 100644 ---- a/tests/run-make/pgo-gen/Makefile -+++ b/tests/run-make/pgo-gen/Makefile -@@ -1,3 +1,4 @@ -+# ignore-stage1 - # needs-profiler-support - # ignore-windows-gnu - -diff --git a/tests/run-make/pgo-indirect-call-promotion/Makefile b/tests/run-make/pgo-indirect-call-promotion/Makefile -index 45302215cc6..519447882ea 100644 ---- a/tests/run-make/pgo-indirect-call-promotion/Makefile -+++ b/tests/run-make/pgo-indirect-call-promotion/Makefile -@@ -1,3 +1,4 @@ -+# ignore-stage1 - # needs-profiler-support - # ignore-windows-gnu - -diff --git a/tests/run-make/pgo-use/Makefile b/tests/run-make/pgo-use/Makefile -index 3bac9b77aa3..5c64b2342e1 100644 ---- a/tests/run-make/pgo-use/Makefile -+++ b/tests/run-make/pgo-use/Makefile -@@ -1,3 +1,4 @@ -+# ignore-stage1 - # needs-profiler-support - # ignore-windows-gnu - -diff --git a/tests/run-make/profile/Makefile b/tests/run-make/profile/Makefile -index fffc051adbf..42a63a871d6 100644 ---- a/tests/run-make/profile/Makefile -+++ b/tests/run-make/profile/Makefile -@@ -1,3 +1,4 @@ -+# ignore-stage1 - # needs-profiler-support - - include ../tools.mk -diff --git a/tests/run-make/sysroot-crates-are-unstable/Makefile b/tests/run-make/sysroot-crates-are-unstable/Makefile -index 1e267fb9576..e3e83c52cc2 100644 ---- a/tests/run-make/sysroot-crates-are-unstable/Makefile -+++ b/tests/run-make/sysroot-crates-are-unstable/Makefile -@@ -1,2 +1,3 @@ -+# ignore-stage1 - all: - '$(PYTHON)' test.py -diff --git a/tests/run-make/target-specs/Makefile b/tests/run-make/target-specs/Makefile -index a33f5368e3c..84459293364 100644 ---- a/tests/run-make/target-specs/Makefile -+++ b/tests/run-make/target-specs/Makefile -@@ -1,3 +1,4 @@ -+# ignore-stage1 - include ../tools.mk - all: - $(RUSTC) foo.rs --target=my-awesome-platform.json --crate-type=lib --emit=asm -diff --git a/tests/ui/functions-closures/fn-help-with-err.rs b/tests/ui/functions-closures/fn-help-with-err.rs -index 612fe1b8419..d021f33c550 100644 ---- a/tests/ui/functions-closures/fn-help-with-err.rs -+++ b/tests/ui/functions-closures/fn-help-with-err.rs -@@ -1,4 +1,5 @@ - // This test case checks the behavior of typeck::check::method::suggest::is_fn on Ty::Error. -+// ignore-stage1 - - struct Foo; - -diff --git a/tests/run-make/pointer-auth-link-with-c/Makefile b/tests/run-make/pointer-auth-link-with-c/Makefile -index dffbd303582..5347d0a90f1 100644 ---- a/tests/run-make/pointer-auth-link-with-c/Makefile -+++ b/tests/run-make/pointer-auth-link-with-c/Makefile -@@ -1,3 +1,4 @@ -+# ignore-stage1 - include ../tools.mk - - # only-aarch64 diff --git a/poky/meta/recipes-devtools/rust/rust-source.inc b/poky/meta/recipes-devtools/rust/rust-source.inc index 0009c50172..4a720e645b 100644 --- a/poky/meta/recipes-devtools/rust/rust-source.inc +++ b/poky/meta/recipes-devtools/rust/rust-source.inc @@ -6,7 +6,7 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n file://0001-Do-not-use-LFS64-on-linux-with-musl.patch;patchdir=${RUSTSRC} \ file://zlib-off64_t.patch;patchdir=${RUSTSRC} \ file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC} \ - file://rust-oe-selftest.patch;patchdir=${RUSTSRC} \ + file://bootstrap_fail.patch;patchdir=${RUSTSRC} \ " SRC_URI[rust.sha256sum] = "bb8e9c564566b2d3228d95de9063a9254182446a161353f1d843bfbaf5c34639" diff --git a/poky/meta/recipes-devtools/strace/strace/00ace1392f5bd289239b755458dcdeeed69af1da.patch b/poky/meta/recipes-devtools/strace/strace/00ace1392f5bd289239b755458dcdeeed69af1da.patch deleted file mode 100644 index bdf815e55e..0000000000 --- a/poky/meta/recipes-devtools/strace/strace/00ace1392f5bd289239b755458dcdeeed69af1da.patch +++ /dev/null @@ -1,303 +0,0 @@ -From 00ace1392f5bd289239b755458dcdeeed69af1da Mon Sep 17 00:00:00 2001 -From: "Dmitry V. Levin" <ldv@strace.io> -Date: Mon, 26 Jun 2023 10:00:00 +0000 -Subject: [PATCH] tests: avoid accept() libc function when tracing accept() - syscall - -The libc function is allowed to implement accept() using accept4() -syscall, so migrate to accept4() those tests that trace accept() syscall -but do not test accept() specifically, and change the test of accept() -syscall to invoke either __NR_accept or __NR_socketcall(SYS_ACCEPT) -directly. - -* tests/accept_compat.h: Remove. -* tests/Makefile.am (EXTRA_DIST): Remove accept_compat.h. -* tests/accept.c [TEST_SYSCALL_NAME]: Do not invoke accept(), -call __NR_accept or __NR_socketcall if available, or skip the test. -* tests/net-y-unix.c: Do not include "accept_compat.h". -(main): Invoke accept4() instead of accept(). -* tests/net-yy-inet.c: Likewise. -* tests/net-yy-unix.c: Likewise. - -Resolves: https://github.com/strace/strace/issues/260 - -Upstream-Status: Backport ---- - tests/Makefile.am | 1 - - tests/accept.c | 36 ++++++++++++++++++++---------------- - tests/accept_compat.h | 32 -------------------------------- - tests/net-y-unix.c | 16 ++++++++-------- - tests/net-yy-inet.c | 12 ++++++------ - tests/net-yy-unix.c | 16 ++++++++-------- - 6 files changed, 42 insertions(+), 71 deletions(-) - delete mode 100644 tests/accept_compat.h - -Index: strace-6.3/tests/Makefile.am -=================================================================== ---- strace-6.3.orig/tests/Makefile.am -+++ strace-6.3/tests/Makefile.am -@@ -776,7 +776,6 @@ check_DATA = \ - # end of check_DATA - - EXTRA_DIST = \ -- accept_compat.h \ - attach-p-cmd.h \ - clock_adjtime-common.c \ - clock_xettime-common.c \ -Index: strace-6.3/tests/accept.c -=================================================================== ---- strace-6.3.orig/tests/accept.c -+++ strace-6.3/tests/accept.c -@@ -9,38 +9,36 @@ - */ - - #include "tests.h" -- -+#include "scno.h" - #include <unistd.h> - --#include "scno.h" -+#ifndef TEST_SYSCALL_NAME - --#if defined __NR_accept -+# if defined __NR_accept || defined __NR_socketcall - --# ifndef TEST_SYSCALL_NAME - # define TEST_SYSCALL_NAME do_accept -- --# ifndef TEST_SYSCALL_STR --# define TEST_SYSCALL_STR "accept" --# endif -+# define TEST_SYSCALL_STR "accept" - - static int - do_accept(int sockfd, void *addr, void *addrlen) - { -+# ifdef __NR_accept - return syscall(__NR_accept, sockfd, addr, addrlen); -+# else /* __NR_socketcall */ -+ const long args[] = { sockfd, (long) addr, (long) addrlen }; -+ return syscall(__NR_socketcall, 5, args); -+# endif - } --# endif /* !TEST_SYSCALL_NAME */ - --#else /* !__NR_accept */ -+# endif /* __NR_accept || __NR_socketcall */ - --# ifndef TEST_SYSCALL_NAME --# define TEST_SYSCALL_NAME accept --# endif -+#endif /* !TEST_SYSCALL_NAME */ - --#endif /* __NR_accept */ -+#ifdef TEST_SYSCALL_NAME - --#define TEST_SYSCALL_PREPARE connect_un() -+# define TEST_SYSCALL_PREPARE connect_un() - static void connect_un(void); --#include "sockname.c" -+# include "sockname.c" - - static void - connect_un(void) -@@ -90,3 +88,9 @@ main(void) - puts("+++ exited with 0 +++"); - return 0; - } -+ -+#else -+ -+SKIP_MAIN_UNDEFINED("__NR_accept || __NR_socketcall") -+ -+#endif -Index: strace-6.3/tests/accept_compat.h -=================================================================== ---- strace-6.3.orig/tests/accept_compat.h -+++ /dev/null -@@ -1,32 +0,0 @@ --/* -- * Copyright (c) 2018-2019 The strace developers. -- * All rights reserved. -- * -- * SPDX-License-Identifier: GPL-2.0-or-later -- */ -- --#ifndef _STRACE_TESTS_ACCEPT_COMPAT_H_ --# define _STRACE_TESTS_ACCEPT_COMPAT_H_ -- --# include <unistd.h> --# include <sys/socket.h> --# include "scno.h" -- --# if defined __NR_socketcall && defined __sparc__ --/* -- * Work around the fact that -- * - glibc >= 2.26 uses accept4 syscall to implement accept() call on sparc; -- * - accept syscall had not been wired up on sparc until v4.4-rc8~4^2~1. -- */ --static inline int --do_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen) --{ -- const long args[] = { sockfd, (long) addr, (long) addrlen }; -- -- return syscall(__NR_socketcall, 5, args); --} --# else --# define do_accept accept --# endif -- --#endif /* !_STRACE_TESTS_ACCEPT_COMPAT_H_ */ -Index: strace-6.3/tests/net-y-unix.c -=================================================================== ---- strace-6.3.orig/tests/net-y-unix.c -+++ strace-6.3/tests/net-y-unix.c -@@ -10,6 +10,7 @@ - - #include "tests.h" - #include <assert.h> -+#include <fcntl.h> - #include <stddef.h> - #include <stdio.h> - #include <stdlib.h> -@@ -18,8 +19,6 @@ - #include <sys/socket.h> - #include <sys/un.h> - --#include "accept_compat.h" -- - #define TEST_SOCKET "net-y-unix.socket" - - int -@@ -88,12 +87,12 @@ main(void) - struct sockaddr * const accept_sa = tail_alloc(sizeof(addr)); - memset(accept_sa, 0, sizeof(addr)); - *len = sizeof(addr); -- int accept_fd = do_accept(listen_fd, accept_sa, len); -+ int accept_fd = accept4(listen_fd, accept_sa, len, O_CLOEXEC); - if (accept_fd < 0) - perror_msg_and_fail("accept"); - unsigned long accept_inode = inode_of_sockfd(accept_fd); -- printf("accept(%d<socket:[%lu]>, {sa_family=AF_UNIX}" -- ", [%d => %d]) = %d<socket:[%lu]>\n", -+ printf("accept4(%d<socket:[%lu]>, {sa_family=AF_UNIX}" -+ ", [%d => %d], SOCK_CLOEXEC) = %d<socket:[%lu]>\n", - listen_fd, listen_inode, - (int) sizeof(addr), (int) *len, - accept_fd, accept_inode); -@@ -160,14 +159,15 @@ main(void) - - memset(accept_sa, 0, sizeof(addr)); - *len = sizeof(addr); -- accept_fd = do_accept(listen_fd, accept_sa, len); -+ accept_fd = accept4(listen_fd, accept_sa, len, O_CLOEXEC); - if (accept_fd < 0) - perror_msg_and_fail("accept"); - accept_inode = inode_of_sockfd(accept_fd); - const char * const sun_path1 = - ((struct sockaddr_un *) accept_sa)->sun_path + 1; -- printf("accept(%d<socket:[%lu]>, {sa_family=AF_UNIX" -- ", sun_path=@\"%s\"}, [%d => %d]) = %d<socket:[%lu]>\n", -+ printf("accept4(%d<socket:[%lu]>, {sa_family=AF_UNIX" -+ ", sun_path=@\"%s\"}, [%d => %d], SOCK_CLOEXEC)" -+ " = %d<socket:[%lu]>\n", - listen_fd, listen_inode, sun_path1, - (int) sizeof(addr), (int) *len, - accept_fd, accept_inode); -Index: strace-6.3/tests/net-yy-inet.c -=================================================================== ---- strace-6.3.orig/tests/net-yy-inet.c -+++ strace-6.3/tests/net-yy-inet.c -@@ -10,6 +10,7 @@ - - #include "tests.h" - #include <assert.h> -+#include <fcntl.h> - #include <stddef.h> - #include <stdio.h> - #include <string.h> -@@ -19,8 +20,6 @@ - #include <netinet/tcp.h> - #include <arpa/inet.h> - --#include "accept_compat.h" -- - #ifndef ADDR_FAMILY - # define ADDR_FAMILY_FIELD sin_family - # define ADDR_FAMILY AF_INET -@@ -104,14 +103,15 @@ main(void) - struct sockaddr * const accept_sa = tail_alloc(sizeof(addr)); - memset(accept_sa, 0, sizeof(addr)); - *len = sizeof(addr); -- const int accept_fd = do_accept(listen_fd, accept_sa, len); -+ const int accept_fd = accept4(listen_fd, accept_sa, len, O_CLOEXEC); - if (accept_fd < 0) - perror_msg_and_fail("accept"); - const unsigned int connect_port = - ntohs(((struct SOCKADDR_TYPE *) accept_sa)->INPORT); -- printf("accept(%d<" TCP_STR ":[" LOOPBACK ":%u]>, {sa_family=" AF_STR -- ", " INPORT_STR "=htons(%u), " INADDR_STR SA_FIELDS "}" -- ", [%u]) = %d<" TCP_STR ":[" LOOPBACK ":%u->" LOOPBACK ":%u]>\n", -+ printf("accept4(%d<" TCP_STR ":[" LOOPBACK ":%u]>, {sa_family=" AF_STR -+ ", " INPORT_STR "=htons(%u), " INADDR_STR SA_FIELDS "}, [%u]" -+ ", SOCK_CLOEXEC) = %d<" TCP_STR ":[" LOOPBACK ":%u->" LOOPBACK -+ ":%u]>\n", - listen_fd, listen_port, connect_port, (unsigned) *len, - accept_fd, listen_port, connect_port); - -Index: strace-6.3/tests/net-yy-unix.c -=================================================================== ---- strace-6.3.orig/tests/net-yy-unix.c -+++ strace-6.3/tests/net-yy-unix.c -@@ -10,6 +10,7 @@ - - #include "tests.h" - #include <assert.h> -+#include <fcntl.h> - #include <stddef.h> - #include <stdio.h> - #include <stdlib.h> -@@ -22,8 +23,6 @@ - # include "xmalloc.h" - #endif - --#include "accept_compat.h" -- - #define TEST_SOCKET "net-yy-unix.socket" - - int -@@ -112,12 +111,12 @@ main(void) - struct sockaddr * const accept_sa = tail_alloc(sizeof(addr)); - memset(accept_sa, 0, sizeof(addr)); - *len = sizeof(addr); -- int accept_fd = do_accept(listen_fd, accept_sa, len); -+ int accept_fd = accept4(listen_fd, accept_sa, len, O_CLOEXEC); - if (accept_fd < 0) - perror_msg_and_fail("accept"); - unsigned long accept_inode = inode_of_sockfd(accept_fd); -- printf("accept(%d<%s:[%lu,\"%s\"]>, {sa_family=AF_UNIX}" -- ", [%d => %d]) = %d<%s:[%lu->%lu,\"%s\"]>\n", -+ printf("accept4(%d<%s:[%lu,\"%s\"]>, {sa_family=AF_UNIX}" -+ ", [%d => %d], SOCK_CLOEXEC) = %d<%s:[%lu->%lu,\"%s\"]>\n", - listen_fd, sock_proto_name, listen_inode, TEST_SOCKET, - (int) sizeof(addr), (int) *len, - accept_fd, sock_proto_name, accept_inode, connect_inode, -@@ -191,14 +190,15 @@ main(void) - - memset(accept_sa, 0, sizeof(addr)); - *len = sizeof(addr); -- accept_fd = do_accept(listen_fd, accept_sa, len); -+ accept_fd = accept4(listen_fd, accept_sa, len, O_CLOEXEC); - if (accept_fd < 0) - perror_msg_and_fail("accept"); - accept_inode = inode_of_sockfd(accept_fd); - const char * const sun_path1 = - ((struct sockaddr_un *) accept_sa)->sun_path + 1; -- printf("accept(%d<%s:[%lu,\"%s\"]>, {sa_family=AF_UNIX" -- ", sun_path=@\"%s\"}, [%d => %d]) = %d<%s:[%lu->%lu,\"%s\"]>\n", -+ printf("accept4(%d<%s:[%lu,\"%s\"]>, {sa_family=AF_UNIX" -+ ", sun_path=@\"%s\"}, [%d => %d], SOCK_CLOEXEC)" -+ " = %d<%s:[%lu->%lu,\"%s\"]>\n", - listen_fd, sock_proto_name, listen_inode, TEST_SOCKET, - sun_path1, (int) sizeof(addr), (int) *len, - accept_fd, sock_proto_name, accept_inode, connect_inode, diff --git a/poky/meta/recipes-devtools/strace/strace/3bbfb541b258baec9eba674b5d8dc30007a61542.patch b/poky/meta/recipes-devtools/strace/strace/3bbfb541b258baec9eba674b5d8dc30007a61542.patch deleted file mode 100644 index b4c6ff99de..0000000000 --- a/poky/meta/recipes-devtools/strace/strace/3bbfb541b258baec9eba674b5d8dc30007a61542.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3bbfb541b258baec9eba674b5d8dc30007a61542 Mon Sep 17 00:00:00 2001 -From: "Dmitry V. Levin" <ldv@strace.io> -Date: Wed, 21 Jun 2023 08:00:00 +0000 -Subject: [PATCH] net: enhance getsockopt decoding - -When getsockopt syscall fails the kernel sometimes updates the optlen -argument, for example, NETLINK_LIST_MEMBERSHIPS updates it even if -optval is not writable. - -* src/net.c (SYS_FUNC(getsockopt)): Try to fetch and print optlen -argument on exiting syscall regardless of getsockopt exit status. - -Upstream-Status: Backport ---- - src/net.c | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/src/net.c b/src/net.c -index f68ccb947..7244b5e57 100644 ---- a/src/net.c -+++ b/src/net.c -@@ -1038,7 +1038,7 @@ SYS_FUNC(getsockopt) - } else { - ulen = get_tcb_priv_ulong(tcp); - -- if (syserror(tcp) || umove(tcp, tcp->u_arg[4], &rlen) < 0) { -+ if (umove(tcp, tcp->u_arg[4], &rlen) < 0) { - /* optval */ - printaddr(tcp->u_arg[3]); - tprint_arg_next(); -@@ -1047,6 +1047,19 @@ SYS_FUNC(getsockopt) - tprint_indirect_begin(); - PRINT_VAL_D(ulen); - tprint_indirect_end(); -+ } else if (syserror(tcp)) { -+ /* optval */ -+ printaddr(tcp->u_arg[3]); -+ tprint_arg_next(); -+ -+ /* optlen */ -+ tprint_indirect_begin(); -+ if (ulen != rlen) { -+ PRINT_VAL_D(ulen); -+ tprint_value_changed(); -+ } -+ PRINT_VAL_D(rlen); -+ tprint_indirect_end(); - } else { - /* optval */ - print_getsockopt(tcp, tcp->u_arg[1], tcp->u_arg[2], diff --git a/poky/meta/recipes-devtools/strace/strace/f31c2f4494779e5c5f170ad10539bfc2dfafe967.patch b/poky/meta/recipes-devtools/strace/strace/f31c2f4494779e5c5f170ad10539bfc2dfafe967.patch deleted file mode 100644 index a0843836c2..0000000000 --- a/poky/meta/recipes-devtools/strace/strace/f31c2f4494779e5c5f170ad10539bfc2dfafe967.patch +++ /dev/null @@ -1,50 +0,0 @@ -From f31c2f4494779e5c5f170ad10539bfc2dfafe967 Mon Sep 17 00:00:00 2001 -From: "Dmitry V. Levin" <ldv@strace.io> -Date: Sat, 24 Jun 2023 08:00:00 +0000 -Subject: [PATCH] tests: update sockopt-sol_netlink test - -Update sockopt-sol_netlink test that started to fail, likely -due to recent linux kernel commit f4e4534850a9 ("net/netlink: fix -NETLINK_LIST_MEMBERSHIPS length report"). - -* tests/sockopt-sol_netlink.c (main): Always print changing optlen value -on exiting syscall. - -Reported-by: Alexander Gordeev <agordeev@linux.ibm.com> ---- - tests/sockopt-sol_netlink.c | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -Upstream-Status: Backport - -diff --git a/tests/sockopt-sol_netlink.c b/tests/sockopt-sol_netlink.c -index 82b98adc23..1c33219ac5 100644 ---- a/tests/sockopt-sol_netlink.c -+++ b/tests/sockopt-sol_netlink.c -@@ -94,7 +94,10 @@ main(void) - printf("%p", val); - else - printf("[%d]", *val); -- printf(", [%d]) = %s\n", *len, errstr); -+ printf(", [%d", (int) sizeof(*val)); -+ if ((int) sizeof(*val) != *len) -+ printf(" => %d", *len); -+ printf("]) = %s\n", errstr); - - /* optlen larger than necessary - shortened */ - *len = sizeof(*val) + 1; -@@ -150,8 +153,12 @@ main(void) - /* optval EFAULT - print address */ - *len = sizeof(*val); - get_sockopt(fd, names[i].val, efault, len); -- printf("getsockopt(%d, SOL_NETLINK, %s, %p, [%d]) = %s\n", -- fd, names[i].str, efault, *len, errstr); -+ printf("getsockopt(%d, SOL_NETLINK, %s, %p", -+ fd, names[i].str, efault); -+ printf(", [%d", (int) sizeof(*val)); -+ if ((int) sizeof(*val) != *len) -+ printf(" => %d", *len); -+ printf("]) = %s\n", errstr); - - /* optlen EFAULT - print address */ - get_sockopt(fd, names[i].val, val, len + 1); diff --git a/poky/meta/recipes-devtools/strace/strace_6.3.bb b/poky/meta/recipes-devtools/strace/strace_6.4.bb index a47cc71724..2174790fbe 100644 --- a/poky/meta/recipes-devtools/strace/strace_6.3.bb +++ b/poky/meta/recipes-devtools/strace/strace_6.4.bb @@ -14,11 +14,8 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://skip-load.patch \ file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \ file://0002-tests-Replace-off64_t-with-off_t.patch \ - file://00ace1392f5bd289239b755458dcdeeed69af1da.patch \ - file://f31c2f4494779e5c5f170ad10539bfc2dfafe967.patch \ - file://3bbfb541b258baec9eba674b5d8dc30007a61542.patch \ " -SRC_URI[sha256sum] = "e17878e301506c1cc301611118ad14efee7f8bcef63b27ace5d290acce7bb731" +SRC_URI[sha256sum] = "27987dbac57fdfd260c6db4dc8328df35c95c6867c8a3d4371d59cdcf4eb9238" inherit autotools ptest diff --git a/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index 9e77f12b53..7d151d4642 100644 --- a/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -6,8 +6,8 @@ BUGTRACKER = "https://bugs.eclipse.org/bugs/" LICENSE = "EPL-1.0 | EDL-1.0" LIC_FILES_CHKSUM = "file://edl-v10.html;md5=522a390a83dc186513f0500543ad3679" -SRCREV = "4a2c4baaccbc8c29ce0297705de9a4e096d57ce5" -PV = "1.7.0+git${SRCPV}" +SRCREV = "1f11747e83ebf4f53e8d17f430136f92ec378709" +PV = "1.8.0+git${SRCPV}" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" SRC_URI = "git://git.eclipse.org/r/tcf/org.eclipse.tcf.agent.git;protocol=https;branch=master \ |