| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From e74b57febec9bd806e29025e6eeb8091e7021d75 Mon Sep 17 00:00:00 2001 |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 26 Jan 2020 11:27:40 -0800 |
| 4 | Subject: [PATCH] Filter out __has_include* compiler defines |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 5 | |
| 6 | They are internal to compiler and this header is later on includes in C |
| 7 | files, but newer gcc >= 10 complains about it. |
| 8 | |
| 9 | error in initial header file: |
| 10 | | In file included from /tmp/20200124-86625-14hiju4.c:1: |
| 11 | | /tmp/20200124-86625-11y6l6i.h:13849:9: error: "__has_include" cannot be used as a macro name |
| 12 | | 13849 | #define __has_include __has_include |
| 13 | | | ^~~~~~~~~~~~~ |
| 14 | | compilation terminated due to -Wfatal-errors. |
| 15 | |
| 16 | Upstream-Status: Pending |
| 17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 18 | |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 19 | --- |
| 20 | common.mk | 2 ++ |
| 21 | 1 file changed, 2 insertions(+) |
| 22 | |
| 23 | diff --git a/common.mk b/common.mk |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 24 | index 664f750..3b8fbe6 100644 |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 25 | --- a/common.mk |
| 26 | +++ b/common.mk |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 27 | @@ -238,6 +238,8 @@ $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time: probes.h vm.$(OBJE |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 28 | $(ECHO) building $(@F:.time=.h) |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 29 | $(Q)$(MINIRUBY) $(tooldir)/mjit_tabs.rb "$(MJIT_TABS)" \ |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 30 | $(CPP) -DMJIT_HEADER $(MJIT_HEADER_FLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/vm.c $(CPPOUTFLAG)$(@F:.time=.h).new |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 31 | + $(Q)sed -i -e "/#define __has_include __has_include/d" $(@F:.time=.h).new |
| 32 | + $(Q)sed -i -e "/#define __has_include_next __has_include_next/d" $(@F:.time=.h).new |
| 33 | $(Q) $(IFCHANGE) "--timestamp=$@" $(@F:.time=.h) $(@F:.time=.h).new |
| 34 | |
| 35 | $(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h: $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time |