1From 9d5981eecde2133b9d6099eb99f96b1c29c3e520 Mon Sep 17 00:00:00 2001 2From: Bernd Kuhls <bernd.kuhls@t-online.de> 3Date: Mon, 13 Apr 2020 12:03:01 +0200 4Subject: [PATCH] fix mips build 5 6In total three PR were sent upstream to fix mips builds: 7https://github.com/cisco/openh264/pull/3185 8https://github.com/cisco/openh264/pull/3217 9https://github.com/cisco/openh264/pull/3225 10 11Buildroot used the first version 12https://git.buildroot.net/buildroot/commit/package/libopenh264?id=e8d0df569e1844f7ba28918a53ee38027b325b8f 13downloaded from https://github.com/cisco/openh264/pull/3185 14 15During discussion the gcc option '-march=loongson3a' was changed to 16'-Wa,-mloongson-mmi,-mloongson-ext': 17https://github.com/cisco/openh264/pull/3185#discussion_r337818960 18 19This causes build errors with gcc version 8.3.0 (Buildroot 2020.02) 20 21tmp/cctgEQaw.s:662: Error: opcode not supported on this processor: loongson3a (mips64r2) `bc .L22' 22/tmp/cctgEQaw.s:1679: Error: opcode not supported on this processor: loongson3a (mips64r2) `bc .L27' 23/tmp/cctgEQaw.s:2218: Error: opcode not supported on this processor: loongson3a (mips64r2) `jrc $31' 24 25This patch partly reverts the change to fix mips build. 26 27$ /home/bernd/buildroot/br5/output/host/bin/mips64el-linux-gcc -v 28 29Using built-in specs. 30COLLECT_GCC=/home/bernd/buildroot/br5/output/host/opt/ext-toolchain/bin/mips64el-linux-gcc.br_real 31COLLECT_LTO_WRAPPER=/home/bernd/buildroot/br5/output/host/opt/ext-toolchain/bin/../libexec/gcc/mips64el-buildroot-linux-gnu/8.3.0/lto-wrapper 32Target: mips64el-buildroot-linux-gnu 33Configured with: ./configure --prefix=/opt/br-mips64r6-n64-el-hf-2020.02 --sysconfdir=/opt/br-mips64r6-n64-el-hf-2020.02/etc --enable-static --target=mips64el-buildroot-linux-gnu --with-sysroot=/opt/br-mips64r6-n64-el-hf-2020.02/mips64el-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --with-gmp=/opt/br-mips64r6-n64-el-hf-2020.02 --with-mpc=/opt/br-mips64r6-n64-el-hf-2020.02 --with-mpfr=/opt/br-mips64r6-n64-el-hf-2020.02 --with-pkgversion='Buildroot 2020.02' --with-bugurl=http://bugs.buildroot.net/ --disable-libquadmath --enable-tls --enable-threads --without-isl --without-cloog --with-arch=mips64r6 --with-abi=64 --with-nan=2008 --enable-languages=c,c++ --with-build-time-tools=/opt/br-mips64r6-n64-el-hf-2020.02/mips64el-buildroot-linux-gnu/bin --enable-shared --disable-libgomp 34Thread model: posix 35gcc version 8.3.0 (Buildroot 2020.02) 36 37Patch sent upstream: https://github.com/cisco/openh264/pull/3267 38 39Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 40--- 41 build/arch.mk | 2 +- 42 build/mips-simd-check.sh | 2 +- 43 2 files changed, 2 insertions(+), 2 deletions(-) 44 45diff --git a/build/arch.mk b/build/arch.mk 46index 1bf318ab..c6570ed4 100644 47--- a/build/arch.mk 48+++ b/build/arch.mk 49@@ -41,7 +41,7 @@ ASMFLAGS += -I$(SRC_PATH)codec/common/mips/ 50 ifeq ($(ENABLE_MMI), Yes) 51 ENABLE_MMI = $(shell $(SRC_PATH)build/mips-simd-check.sh $(CC) mmi) 52 ifeq ($(ENABLE_MMI), Yes) 53-CFLAGS += -DHAVE_MMI -Wa,-mloongson-mmi,-mloongson-ext 54+CFLAGS += -DHAVE_MMI -march=loongson3a 55 endif 56 endif 57 #msa 58diff --git a/build/mips-simd-check.sh b/build/mips-simd-check.sh 59index 5efffbef..d0d72f9e 100755 60--- a/build/mips-simd-check.sh 61+++ b/build/mips-simd-check.sh 62@@ -15,7 +15,7 @@ TMPO=$(mktemp tmp.XXXXXX.o) 63 if [ $2 == "mmi" ] 64 then 65 echo "void main(void){ __asm__ volatile(\"punpcklhw \$f0, \$f0, \$f0\"); }" > $TMPC 66- $1 -Wa,-mloongson-mmi $TMPC -o $TMPO &> /dev/null 67+ $1 -march=loongson3a $TMPC -o $TMPO &> /dev/null 68 if test -s $TMPO 69 then 70 echo "Yes" 71-- 722.25.0 73 74