Brad Bishop | 6f8dcde | 2018-10-16 10:47:12 +0800 | [diff] [blame] | 1 | From fb5362f205b37c5060fcd764a7ed393abe4f2f3d Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Fri, 27 Jul 2018 17:39:37 +0800 |
| 4 | Subject: [PATCH 1/2] fix opcode not supported on mips32-linux |
| 5 | |
| 6 | While build tests(`make check') on mips32-linux, there are |
| 7 | serial failures such as: |
| 8 | [snip] |
| 9 | | mips-wrsmllib32-linux-gcc -meb -mabi=32 -mhard-float -c |
| 10 | -o atomic_incs-atomic_incs.o `test -f 'atomic_incs.c' || echo |
| 11 | '../../../valgrind-3.13.0/memcheck/tests/'`atomic_incs.c |
| 12 | | /tmp/ccqrmINN.s: Assembler messages: |
| 13 | | /tmp/ccqrmINN.s:247: Error: opcode not supported on this |
| 14 | processor: mips1 (mips1) `ll $t3,0($t1)' |
| 15 | | /tmp/ccqrmINN.s:249: Error: opcode not supported on this |
| 16 | processor: mips1 (mips1) `sc $t3,0($t1)' |
| 17 | [snip] |
| 18 | |
| 19 | Since the following commit applied, it defines CLFAGS for mips32, |
| 20 | but missed to pass them to tests which caused the above failure |
| 21 | ... |
| 22 | 3e344c57f Merge in a port for mips32-linux |
| 23 | ... |
| 24 | |
| 25 | Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=396905] |
| 26 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 27 | --- |
| 28 | helgrind/tests/Makefile.am | 5 +++++ |
| 29 | memcheck/tests/Makefile.am | 5 +++++ |
| 30 | none/tests/mips32/Makefile.am | 4 ++++ |
| 31 | 3 files changed, 14 insertions(+) |
| 32 | |
| 33 | diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am |
| 34 | index ad1af191a..6209d35a7 100644 |
| 35 | --- a/helgrind/tests/Makefile.am |
| 36 | +++ b/helgrind/tests/Makefile.am |
| 37 | @@ -214,6 +214,11 @@ check_PROGRAMS += annotate_rwlock |
| 38 | endif |
| 39 | |
| 40 | AM_CFLAGS += $(AM_FLAG_M3264_PRI) |
| 41 | + |
| 42 | +if VGCONF_PLATFORMS_INCLUDE_MIPS32_LINUX |
| 43 | +AM_CFLAGS += $(AM_CFLAGS_MIPS32_LINUX) |
| 44 | +endif |
| 45 | + |
| 46 | AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) |
| 47 | |
| 48 | LDADD = -lpthread |
| 49 | diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am |
| 50 | index 84e49405f..aff861a32 100644 |
| 51 | --- a/memcheck/tests/Makefile.am |
| 52 | +++ b/memcheck/tests/Makefile.am |
| 53 | @@ -443,6 +443,11 @@ check_PROGRAMS += reach_thread_register |
| 54 | endif |
| 55 | |
| 56 | AM_CFLAGS += $(AM_FLAG_M3264_PRI) |
| 57 | + |
| 58 | +if VGCONF_PLATFORMS_INCLUDE_MIPS32_LINUX |
| 59 | +AM_CFLAGS += $(AM_CFLAGS_MIPS32_LINUX) |
| 60 | +endif |
| 61 | + |
| 62 | AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) |
| 63 | |
| 64 | if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX |
| 65 | diff --git a/none/tests/mips32/Makefile.am b/none/tests/mips32/Makefile.am |
| 66 | index d11591d45..602cd26f6 100644 |
| 67 | --- a/none/tests/mips32/Makefile.am |
| 68 | +++ b/none/tests/mips32/Makefile.am |
| 69 | @@ -99,6 +99,10 @@ check_PROGRAMS = \ |
| 70 | round_fpu64 \ |
| 71 | fpu_branches |
| 72 | |
| 73 | +if VGCONF_PLATFORMS_INCLUDE_MIPS32_LINUX |
| 74 | +AM_CFLAGS += $(AM_CFLAGS_MIPS32_LINUX) |
| 75 | +endif |
| 76 | + |
| 77 | AM_CFLAGS += @FLAG_M32@ |
| 78 | AM_CXXFLAGS += @FLAG_M32@ |
| 79 | AM_CCASFLAGS += @FLAG_M32@ |
| 80 | -- |
| 81 | 2.17.1 |
| 82 | |