diff options
| author | Peter Trommler <ptrommler@acm.org> | 2021-05-22 11:53:10 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-06-28 10:45:54 -0400 |
| commit | 46c2d0b0ef4f2f2e43facdb84346f36a9d3169ec (patch) | |
| tree | 38d5ef669774c6968edea561f37bc2f0c77ed863 /rts/ghc.mk | |
| parent | 469126b3cef2936d9831283a77d54330d0ff1ba8 (diff) | |
| download | haskell-46c2d0b0ef4f2f2e43facdb84346f36a9d3169ec.tar.gz | |
Fix libffi on PowerPC
Update submodule libffi-tarballs to upstream commit 4f9e20a.
Remove C compiler flags that suppress warnings in the RTS. Those
warnings have been fixed by libffi upstream.
Fixes #19885
Diffstat (limited to 'rts/ghc.mk')
| -rw-r--r-- | rts/ghc.mk | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/rts/ghc.mk b/rts/ghc.mk index be9b03e169..15854de5aa 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -494,19 +494,9 @@ endif # add CFLAGS for libffi ifeq "$(UseSystemLibFFI)" "YES" LIBFFI_CFLAGS = $(addprefix -I,$(FFIIncludeDir)) -else -LIBFFI_CFLAGS = -endif -# ffi.h triggers prototype warnings, so disable them here: -rts/Interpreter_CC_OPTS += -Wno-strict-prototypes $(LIBFFI_CFLAGS) -rts/Adjustor_CC_OPTS += -Wno-strict-prototypes $(LIBFFI_CFLAGS) -rts/sm/Storage_CC_OPTS += -Wno-strict-prototypes $(LIBFFI_CFLAGS) -# ffi.h triggers undefined macro warnings on PowerPC, disable those: -# this matches substrings of powerpc64le, including "powerpc" and "powerpc64" -ifneq "$(findstring $(TargetArch_CPP), powerpc64le)" "" -rts/Interpreter_CC_OPTS += -Wno-undef -rts/Adjustor_CC_OPTS += -Wno-undef -rts/sm/Storage_CC_OPTS += -Wno-undef +rts/Interpreter_CC_OPTS += $(LIBFFI_CFLAGS) +rts/Adjustor_CC_OPTS += $(LIBFFI_CFLAGS) +rts/sm/Storage_CC_OPTS += $(LIBFFI_CFLAGS) endif # inlining warnings happen in Compact |