| Message ID | 20190812033120.43013-5-natechancellor@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Clang build fixes for MIPS | expand |
On Sun, Aug 11, 2019 at 08:31:19PM -0700, Nathan Chancellor wrote: > From: Werner Koch <wk@gnupg.org> > > * mpi/longlong.h [MIPS64][__clang__]: Use the C version like we > already do for 32 bit MIPS > > clang errors: > > lib/mpi/generic_mpih-mul1.c:37:24: error: invalid use of a cast in a > inline asm context requiring an l-value: remove the cast or build with > -fheinous-gnu-extensions > umul_ppmm(prod_high, prod_low, s1_ptr[j], s2_limb); > ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > lib/mpi/longlong.h:652:20: note: expanded from macro 'umul_ppmm' > : "=l" ((USItype)(w0)), \ > ~~~~~~~~~~^~~ > lib/mpi/generic_mpih-mul1.c:37:3: error: invalid output constraint '=h' > in asm > umul_ppmm(prod_high, prod_low, s1_ptr[j], s2_limb); > ^ > lib/mpi/longlong.h:653:7: note: expanded from macro 'umul_ppmm' > "=h" ((USItype)(w1)) \ > ^ > 2 errors generated. > > Fixes: 5ce3e312ec5c ("crypto: GnuPG based MPI lib - header files (part 2)") > Link: https://github.com/ClangBuiltLinux/linux/issues/605 > Link: https://github.com/gpg/libgcrypt/commit/e7ae0ae243c8978a67c802169183187d88557be8 > Signed-off-by: Werner Koch <wk@gnupg.org> > [nc: Added build error and tags to commit message > Modified subject line > Removed GnuPG-bug-id > Removed space between defined and (__clang__)] > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> > --- > lib/mpi/longlong.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/lib/mpi/longlong.h b/lib/mpi/longlong.h > index 8a1507fc94dd..5636e6a09f7a 100644 > --- a/lib/mpi/longlong.h > +++ b/lib/mpi/longlong.h > @@ -688,7 +688,8 @@ do { \ > : "d" ((UDItype)(u)), \ > "d" ((UDItype)(v))); \ > } while (0) > -#elif (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4) > +#elif defined(__clang__) || (__GNUC__ >= 5) || (__GNUC__ == 4 && \ > + __GNUC_MINOR__ >= 4) > #define umul_ppmm(w1, w0, u, v) \ > do { \ > typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \ > -- > 2.23.0.rc2 > Hi Paul, I noticed you didn't pick up this patch with the other ones you applied. I just wanted to make sure it wasn't because it was sent to the wrong person. This set of files doesn't appear to have an owner in MAINTAINERS, I guess based on git history either Andrew or Hubert (on CC) pick up patches for this set of files? If I need to, I can resend it to the proper people. Cheers, Nathan
On Sun, Aug 11, 2019 at 8:31 PM Nathan Chancellor <natechancellor@gmail.com> wrote: > > From: Werner Koch <wk@gnupg.org> > > * mpi/longlong.h [MIPS64][__clang__]: Use the C version like we > already do for 32 bit MIPS > > clang errors: > > lib/mpi/generic_mpih-mul1.c:37:24: error: invalid use of a cast in a > inline asm context requiring an l-value: remove the cast or build with > -fheinous-gnu-extensions Reminds me of: https://github.com/ClangBuiltLinux/linux/commit/7b7c1df2883dd4393592859758c3e76207da8b1d > umul_ppmm(prod_high, prod_low, s1_ptr[j], s2_limb); > ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > lib/mpi/longlong.h:652:20: note: expanded from macro 'umul_ppmm' > : "=l" ((USItype)(w0)), \ > ~~~~~~~~~~^~~ > lib/mpi/generic_mpih-mul1.c:37:3: error: invalid output constraint '=h' > in asm > umul_ppmm(prod_high, prod_low, s1_ptr[j], s2_limb); > ^ > lib/mpi/longlong.h:653:7: note: expanded from macro 'umul_ppmm' > "=h" ((USItype)(w1)) \ > ^ > 2 errors generated. > > Fixes: 5ce3e312ec5c ("crypto: GnuPG based MPI lib - header files (part 2)") > Link: https://github.com/ClangBuiltLinux/linux/issues/605 > Link: https://github.com/gpg/libgcrypt/commit/e7ae0ae243c8978a67c802169183187d88557be8 > Signed-off-by: Werner Koch <wk@gnupg.org> > [nc: Added build error and tags to commit message > Modified subject line > Removed GnuPG-bug-id > Removed space between defined and (__clang__)] > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> > --- > lib/mpi/longlong.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/lib/mpi/longlong.h b/lib/mpi/longlong.h > index 8a1507fc94dd..5636e6a09f7a 100644 > --- a/lib/mpi/longlong.h > +++ b/lib/mpi/longlong.h > @@ -688,7 +688,8 @@ do { \ > : "d" ((UDItype)(u)), \ > "d" ((UDItype)(v))); \ > } while (0) > -#elif (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4) > +#elif defined(__clang__) || (__GNUC__ >= 5) || (__GNUC__ == 4 && \ > + __GNUC_MINOR__ >= 4) So the minimum supported version of GCC to build the kernel is currently 4.6, so we can clean up a lot more here. I'd remove the check, and delete the #elif and #else implementations. > #define umul_ppmm(w1, w0, u, v) \ > do { \ > typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \ > -- > 2.23.0.rc2 >
On Mon, Aug 12, 2019 at 10:42:31AM -0700, Nick Desaulniers wrote: > On Sun, Aug 11, 2019 at 8:31 PM Nathan Chancellor > <natechancellor@gmail.com> wrote: > > > > From: Werner Koch <wk@gnupg.org> > > > > * mpi/longlong.h [MIPS64][__clang__]: Use the C version like we > > already do for 32 bit MIPS > > > > clang errors: > > > > lib/mpi/generic_mpih-mul1.c:37:24: error: invalid use of a cast in a > > inline asm context requiring an l-value: remove the cast or build with > > -fheinous-gnu-extensions > > Reminds me of: > https://github.com/ClangBuiltLinux/linux/commit/7b7c1df2883dd4393592859758c3e76207da8b1d > > > umul_ppmm(prod_high, prod_low, s1_ptr[j], s2_limb); > > ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > lib/mpi/longlong.h:652:20: note: expanded from macro 'umul_ppmm' > > : "=l" ((USItype)(w0)), \ > > ~~~~~~~~~~^~~ > > lib/mpi/generic_mpih-mul1.c:37:3: error: invalid output constraint '=h' > > in asm > > umul_ppmm(prod_high, prod_low, s1_ptr[j], s2_limb); > > ^ > > lib/mpi/longlong.h:653:7: note: expanded from macro 'umul_ppmm' > > "=h" ((USItype)(w1)) \ > > ^ > > 2 errors generated. > > > > Fixes: 5ce3e312ec5c ("crypto: GnuPG based MPI lib - header files (part 2)") > > Link: https://github.com/ClangBuiltLinux/linux/issues/605 > > Link: https://github.com/gpg/libgcrypt/commit/e7ae0ae243c8978a67c802169183187d88557be8 > > Signed-off-by: Werner Koch <wk@gnupg.org> > > [nc: Added build error and tags to commit message > > Modified subject line > > Removed GnuPG-bug-id > > Removed space between defined and (__clang__)] > > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> > > --- > > lib/mpi/longlong.h | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/lib/mpi/longlong.h b/lib/mpi/longlong.h > > index 8a1507fc94dd..5636e6a09f7a 100644 > > --- a/lib/mpi/longlong.h > > +++ b/lib/mpi/longlong.h > > @@ -688,7 +688,8 @@ do { \ > > : "d" ((UDItype)(u)), \ > > "d" ((UDItype)(v))); \ > > } while (0) > > -#elif (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4) > > +#elif defined(__clang__) || (__GNUC__ >= 5) || (__GNUC__ == 4 && \ > > + __GNUC_MINOR__ >= 4) > > So the minimum supported version of GCC to build the kernel is > currently 4.6, so we can clean up a lot more here. I'd remove the > check, and delete the #elif and #else implementations. > Sure, I will dig into this further and send a v2. Thanks for the review, Nathan > > #define umul_ppmm(w1, w0, u, v) \ > > do { \ > > typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \ > > -- > > 2.23.0.rc2 > > > > > -- > Thanks, > ~Nick Desaulniers
diff --git a/lib/mpi/longlong.h b/lib/mpi/longlong.h index 8a1507fc94dd..5636e6a09f7a 100644 --- a/lib/mpi/longlong.h +++ b/lib/mpi/longlong.h @@ -688,7 +688,8 @@ do { \ : "d" ((UDItype)(u)), \ "d" ((UDItype)(v))); \ } while (0) -#elif (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4) +#elif defined(__clang__) || (__GNUC__ >= 5) || (__GNUC__ == 4 && \ + __GNUC_MINOR__ >= 4) #define umul_ppmm(w1, w0, u, v) \ do { \ typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \