This is an archive of the discontinued LLVM Phabricator instance.

Differential D139658

[SPEC2017] Add -fcommon to build ldecod in x264
ClosedPublic

Authored by chaosdefinition on Dec 8 2022, 11:45 AM.

Details

Reviewers
MatzeB
Meinersbur
fhahn
cmatthews
naromero77
Commits
rT361a7aa2097c: [SPEC2017] Add -fcommon to build ldecod in x264
Summary

As stated in https://www.spec.org/cpu2017/Docs/benchmarks/525.x264_r.html#portability, building ldecod requires -fcommon as -fno-common is the default; otherwise linking errors like the following will occur.

/usr/bin/ld: .../525.x264_r/decoder_test.c.o:(.bss+0x0): multiple definition of `cfgparams'; .../525.x264_r/configfile.c.o:(.bss+0x0): first defined here
/usr/bin/ld: .../525.x264_r/config_common.c.o:(.bss+0x0): multiple definition of `cfgparams'; .../525.x264_r/configfile.c.o:(.bss+0x0): first defined here
collect2: error: ld returned 1 exit status

Diff Detail

Repository
rT test-suite

Event Timeline

chaosdefinition created this revision.Dec 8 2022, 11:45 AM
Herald added a project: Restricted Project. · View Herald TranscriptDec 8 2022, 11:45 AM
chaosdefinition requested review of this revision.Dec 8 2022, 11:45 AM
MatzeB accepted this revision.Dec 8 2022, 11:56 AM

makes sense.

This revision is now accepted and ready to land.Dec 8 2022, 11:56 AM
Closed by commit rT361a7aa2097c: [SPEC2017] Add -fcommon to build ldecod in x264 (authored by chaosdefinition). · Explain WhyDec 8 2022, 7:31 PM
This revision was automatically updated to reflect the committed changes.
chaosdefinition added a commit: rT361a7aa2097c: [SPEC2017] Add -fcommon to build ldecod in x264.

Revision Contents

PathSize
External/
SPEC/
CINT2017rate/
525.x264_r/
2 lines

Diff 481505

External/SPEC/CINT2017rate/525.x264_r/CMakeLists.txt

Show First 20 Lines • Show All 175 Lines • ▼ Show 20 Lines
) )
speccpu2017_prepare_rundir() speccpu2017_prepare_rundir()
set(ldecod_Sources) set(ldecod_Sources)
foreach (_file IN LISTS ldecod_SourceNames) foreach (_file IN LISTS ldecod_SourceNames)
list(APPEND ldecod_Sources "${SRC_DIR}/${_file}") list(APPEND ldecod_Sources "${SRC_DIR}/${_file}")
endforeach () endforeach ()
llvm_add_host_executable(ldecod_${SUFFIX}-host llvm_add_host_executable(ldecod_${SUFFIX}-host
ldecod_${SUFFIX} ${ldecod_Sources} ldecod_${SUFFIX} ${ldecod_Sources}
CPPFLAGS -I "${SRC_DIR}/ldecod_src/inc" -DSPEC CPPFLAGS -I "${SRC_DIR}/ldecod_src/inc" -DSPEC -fcommon
LDFLAGS -lm LDFLAGS -lm
) )
# Prepare BuckBunny.yuv used for x264 as input. # Prepare BuckBunny.yuv used for x264 as input.
foreach (_run_type IN LISTS TEST_SUITE_RUN_TYPE) foreach (_run_type IN LISTS TEST_SUITE_RUN_TYPE)
add_custom_command( add_custom_command(
OUTPUT "${RUN_${_run_type}_DIR}/BuckBunny.yuv" OUTPUT "${RUN_${_run_type}_DIR}/BuckBunny.yuv"
Show All 14 Lines