Control: tags -1 patch Hi,
On 19/06/17 13:20, Adrian Bunk wrote: > Source: openmprtl > Version: 4.0-1 > Severity: serious > > https://buildd.debian.org/status/fetch.php?pkg=openmprtl&arch=mips64el&ver=4.0-1&stamp=1497874221&raw=0 > > ... > cd /«PKGBUILDDIR»/obj-mips64el-linux-gnuabi64/runtime/src && /usr/bin/c++ > -Domp_EXPORTS -I/«PKGBUILDDIR»/obj-mips64el-linux-gnuabi64/runtime/src > -I/«PKGBUILDDIR»/runtime/src -I/«PKGBUILDDIR»/runtime/src/i18n > -I/«PKGBUILDDIR»/runtime/src/include/45 > -I/«PKGBUILDDIR»/runtime/src/thirdparty/ittnotify -g -O2 > -fdebug-prefix-map=/«PKGBUILDDIR»=. -fstack-protector-strong -Wformat > -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -D > _GNU_SOURCE -D _REENTRANT -Wdate-time -D_FORTIFY_SOURCE=2 -std=c++11 > -fno-exceptions -fno-rtti -Wno-sign-compare -Wno-unused-function > -Wno-unused-value -Wno-unused-variable -Wno-switch -Wno-unknown-pragmas > -Wno-missing-field-initializers -Wno-missing-braces -Wno-comment -o > CMakeFiles/omp.dir/kmp_global.cpp.o -c > /«PKGBUILDDIR»/runtime/src/kmp_global.cpp > In file included from /«PKGBUILDDIR»/runtime/src/kmp_global.cpp:17:0: > /«PKGBUILDDIR»/runtime/src/kmp_affinity.h:229:4: error: #error Unknown or > unsupported architecture > # error Unknown or unsupported architecture > ^~~~~ > runtime/src/CMakeFiles/omp.dir/build.make:257: recipe for target > 'runtime/src/CMakeFiles/omp.dir/kmp_global.cpp.o' failed It looks to me like the upstream patch was misapplied in kmp_affinity.h. The attached patch should fix this by re-inserting the #else at the end of the #if chain. I also fix the indentation of the mips defines which was off by 1 character. Thanks, James
--- a/runtime/src/kmp_affinity.h
+++ b/runtime/src/kmp_affinity.h
@@ -204,28 +204,29 @@ public:
# elif __NR_sched_getaffinity != 223
# error Wrong code for getaffinity system call.
# endif /* __NR_sched_getaffinity */
-# elif KMP_ARCH_MIPS
-# ifndef __NR_sched_setaffinity
-# define __NR_sched_setaffinity 4239
-# elif __NR_sched_setaffinity != 4239
-# error Wrong code for setaffinity system call.
-# endif /* __NR_sched_setaffinity */
-# ifndef __NR_sched_getaffinity
-# define __NR_sched_getaffinity 4240
-# elif __NR_sched_getaffinity != 4240
-# error Wrong code for getaffinity system call.
-# endif /* __NR_sched_getaffinity */
-# elif KMP_ARCH_MIPS64
-# ifndef __NR_sched_setaffinity
-# define __NR_sched_setaffinity 5195
-# elif __NR_sched_setaffinity != 5195
-# error Wrong code for setaffinity system call.
-# endif /* __NR_sched_setaffinity */
-# ifndef __NR_sched_getaffinity
-# define __NR_sched_getaffinity 5196
-# elif __NR_sched_getaffinity != 5196
-# error Wrong code for getaffinity system call.
-# endif /* __NR_sched_getaffinity */
+# elif KMP_ARCH_MIPS
+# ifndef __NR_sched_setaffinity
+# define __NR_sched_setaffinity 4239
+# elif __NR_sched_setaffinity != 4239
+# error Wrong code for setaffinity system call.
+# endif /* __NR_sched_setaffinity */
+# ifndef __NR_sched_getaffinity
+# define __NR_sched_getaffinity 4240
+# elif __NR_sched_getaffinity != 4240
+# error Wrong code for getaffinity system call.
+# endif /* __NR_sched_getaffinity */
+# elif KMP_ARCH_MIPS64
+# ifndef __NR_sched_setaffinity
+# define __NR_sched_setaffinity 5195
+# elif __NR_sched_setaffinity != 5195
+# error Wrong code for setaffinity system call.
+# endif /* __NR_sched_setaffinity */
+# ifndef __NR_sched_getaffinity
+# define __NR_sched_getaffinity 5196
+# elif __NR_sched_getaffinity != 5196
+# error Wrong code for getaffinity system call.
+# endif /* __NR_sched_getaffinity */
+# else
# error Unknown or unsupported architecture
# endif /* KMP_ARCH_* */
class KMPNativeAffinity : public KMPAffinity {
signature.asc
Description: OpenPGP digital signature
