procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modula2: bootstrap fix for string and vector headers.

Browse source 
This patch fixes the include of headers (<string> and <vector>) which
are included after GCC's system.h has been included.  It defines
INCLUDE_STRING before including "system.h".  This allows gcc to
bootstrap with Apple clang 15.

gcc/m2/ChangeLog:

	* gm2-gcc/m2linemap.cc (INCLUDE_STRING): Define before
	include of gcc-consolidation.h.
	* gm2spec.cc (INCLUDE_STRING): Define before include of
	system.h.
	(INCLUDE_VECTOR): Ditto.

Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>
This commit is contained in:
FX Coudert 2024-07-12 15:39:50 +01:00 • committed by Gaius Mulley
parent ae829a2778
commit f4047a8614
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gcc/m2/gm2-gcc/m2linemap.cc
View file

@ -19,6 +19,7 @@ You should have received a copy of the GNU General Public License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#define INCLUDE_STRING
#include "gcc-consolidation.h"
/* Utilize some of the C build routines */
@ -36,7 +37,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#define m2linemap_c
#include "m2linemap.h"
#include "m2color.h"
#include <string>
static int inFile = FALSE;

4
gcc/m2/gm2spec.cc
View file

@ -20,6 +20,8 @@ along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
#define INCLUDE_STRING
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
#include "tm.h"
@ -31,8 +33,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#include "gcc.h"
#include "opts.h"
#include "vec.h"
#include <vector>
#include <string>
#include "m2/gm2config.h"