4408155ac5
The non-standard .fa library suffix breaks the link source
de-duplication done by Meson so drop it.
The lack of link source de-duplication causes AddressSanitizer to
complain ODR violations, and makes GNU ld abort when combined with
clang's LTO.
Fortunately, the non-standard suffix is not necessary anymore for
two reasons.
First, the non-standard suffix was necessary for fork-fuzzing.
Meson wraps all standard-suffixed libraries with --start-group and
--end-group. This made a fork-fuzz.ld linker script wrapped as well and
broke builds. Commit d2e6f9272d ("fuzz: remove fork-fuzzing
scaffolding") dropped fork-fuzzing so we can now restore the standard
suffix.
Second, the libraries are not even built anymore, because it is
possible to just use the object files directly via extract_all_objects().
The occurences of the suffix were detected and removed by performing
a tree-wide search with 'fa' and .fa (note the quotes and dot).
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Message-ID: <20240524-xkb-v4-4-2de564e5c859@daynix.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
106 lines
3.0 KiB
YAML
106 lines
3.0 KiB
YAML
.native_build_job_template:
|
|
extends: .base_job_template
|
|
stage: build
|
|
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG
|
|
cache:
|
|
paths:
|
|
- ccache
|
|
key: "$CI_JOB_NAME"
|
|
when: always
|
|
before_script:
|
|
- JOBS=$(expr $(nproc) + 1)
|
|
script:
|
|
- export CCACHE_BASEDIR="$(pwd)"
|
|
- export CCACHE_DIR="$CCACHE_BASEDIR/ccache"
|
|
- export CCACHE_MAXSIZE="500M"
|
|
- export PATH="$CCACHE_WRAPPERSDIR:$PATH"
|
|
- du -sh .git
|
|
- mkdir build
|
|
- cd build
|
|
- ccache --zero-stats
|
|
- ../configure --enable-werror --disable-docs --enable-fdt=system
|
|
${TARGETS:+--target-list="$TARGETS"}
|
|
$CONFIGURE_ARGS ||
|
|
{ cat config.log meson-logs/meson-log.txt && exit 1; }
|
|
- if test -n "$LD_JOBS";
|
|
then
|
|
pyvenv/bin/meson configure . -Dbackend_max_links="$LD_JOBS" ;
|
|
fi || exit 1;
|
|
- $MAKE -j"$JOBS"
|
|
- if test -n "$MAKE_CHECK_ARGS";
|
|
then
|
|
$MAKE -j"$JOBS" $MAKE_CHECK_ARGS ;
|
|
fi
|
|
- ccache --show-stats
|
|
|
|
# We jump some hoops in common_test_job_template to avoid
|
|
# rebuilding all the object files we skip in the artifacts
|
|
.native_build_artifact_template:
|
|
artifacts:
|
|
when: on_success
|
|
expire_in: 2 days
|
|
paths:
|
|
- build
|
|
- .git-submodule-status
|
|
exclude:
|
|
- build/**/*.p
|
|
- build/**/*.a.p
|
|
- build/**/*.c.o
|
|
- build/**/*.c.o.d
|
|
|
|
.common_test_job_template:
|
|
extends: .base_job_template
|
|
stage: test
|
|
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG
|
|
script:
|
|
- scripts/git-submodule.sh update roms/SLOF
|
|
- meson subprojects download $(cd build/subprojects && echo *)
|
|
- cd build
|
|
- find . -type f -exec touch {} +
|
|
# Avoid recompiling by hiding ninja with NINJA=":"
|
|
- $MAKE NINJA=":" $MAKE_CHECK_ARGS
|
|
|
|
.native_test_job_template:
|
|
extends: .common_test_job_template
|
|
artifacts:
|
|
name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
|
|
when: always
|
|
expire_in: 7 days
|
|
paths:
|
|
- build/meson-logs/testlog.txt
|
|
reports:
|
|
junit: build/meson-logs/testlog.junit.xml
|
|
|
|
.avocado_test_job_template:
|
|
extends: .common_test_job_template
|
|
cache:
|
|
key: "${CI_JOB_NAME}-cache"
|
|
paths:
|
|
- ${CI_PROJECT_DIR}/avocado-cache
|
|
policy: pull-push
|
|
artifacts:
|
|
name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
|
|
when: always
|
|
expire_in: 7 days
|
|
paths:
|
|
- build/tests/results/latest/results.xml
|
|
- build/tests/results/latest/test-results
|
|
reports:
|
|
junit: build/tests/results/latest/results.xml
|
|
before_script:
|
|
- mkdir -p ~/.config/avocado
|
|
- echo "[datadir.paths]" > ~/.config/avocado/avocado.conf
|
|
- echo "cache_dirs = ['${CI_PROJECT_DIR}/avocado-cache']"
|
|
>> ~/.config/avocado/avocado.conf
|
|
- echo -e '[job.output.testlogs]\nstatuses = ["FAIL", "INTERRUPT"]'
|
|
>> ~/.config/avocado/avocado.conf
|
|
- if [ -d ${CI_PROJECT_DIR}/avocado-cache ]; then
|
|
du -chs ${CI_PROJECT_DIR}/avocado-cache ;
|
|
fi
|
|
- export AVOCADO_ALLOW_UNTRUSTED_CODE=1
|
|
after_script:
|
|
- cd build
|
|
- du -chs ${CI_PROJECT_DIR}/avocado-cache
|
|
variables:
|
|
QEMU_JOB_AVOCADO: 1
|