diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-07-12 09:31:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-12 09:44:35 +0100 |
| commit | 13475e540970a614a16e6a1be29dc5b2b47b7b05 (patch) | |
| tree | 94d1c27775cbc665a9adad4a4eb92d123526693c /boost | |
| parent | 2c409f5a9871941ee380f200872769c62c665784 (diff) | |
fix mips build: opcode not supported on this processor
Change-Id: Ie07c6ac0471ecdf6236d194f1ec3389dd47d4b31
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/boost.mipsbackport.patch | 42 | ||||
| -rw-r--r-- | boost/makefile.mk | 2 |
2 files changed, 44 insertions, 0 deletions
diff --git a/boost/boost.mipsbackport.patch b/boost/boost.mipsbackport.patch new file mode 100644 index 000000000000..085d2324db73 --- /dev/null +++ b/boost/boost.mipsbackport.patch @@ -0,0 +1,42 @@ +--- misc/boost_1_44_0/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp 2009-03-27 13:10:46.000000000 +0000 ++++ misc/build/boost_1_44_0/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp 2011-11-07 14:25:23.000000000 +0000 +@@ -37,9 +37,12 @@ + __asm__ __volatile__ + ( + "0:\n\t" ++ ".set push\n\t" ++ ".set mips2\n\t" + "ll %0, %1\n\t" + "addiu %0, 1\n\t" + "sc %0, %1\n\t" ++ ".set pop\n\t" + "beqz %0, 0b": + "=&r"( tmp ), "=m"( *pw ): + "m"( *pw ) +@@ -55,9 +58,12 @@ + __asm__ __volatile__ + ( + "0:\n\t" ++ ".set push\n\t" ++ ".set mips2\n\t" + "ll %1, %2\n\t" + "addiu %0, %1, -1\n\t" + "sc %0, %2\n\t" ++ ".set pop\n\t" + "beqz %0, 0b\n\t" + "addiu %0, %1, -1": + "=&r"( rv ), "=&r"( tmp ), "=m"( *pw ): +@@ -78,10 +84,13 @@ + __asm__ __volatile__ + ( + "0:\n\t" ++ ".set push\n\t" ++ ".set mips2\n\t" + "ll %0, %2\n\t" + "beqz %0, 1f\n\t" + "addiu %1, %0, 1\n\t" + "sc %1, %2\n\t" ++ ".set pop\n\t" + "beqz %1, 0b\n\t" + "addiu %0, %0, 1\n\t" + "1:": diff --git a/boost/makefile.mk b/boost/makefile.mk index 5b8957fa7827..719a536c8323 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -63,6 +63,8 @@ PATCH_FILES+=boost.gcc47679.patch PATCH_FILES+=boost.6369.warnings.patch #https://svn.boost.org/trac/boost/ticket/6397 PATCH_FILES+=boost.6397.warnings.patch +#backport from boost 1.48.0 fix for "opcode not supported on this processor" +PATCH_FILES+=boost.mipsbackport.patch PATCH_FILES+=boost.windows.patch |