From 9236590ff07d51e6ba1109ff29054e41dbd0cdf4 Mon Sep 17 00:00:00 2001 From: Richard Brooksby Date: Mon, 3 Sep 2012 13:47:41 +0100 Subject: [PATCH] Fixing up reformed variety build on 64-bit freebsd. Copied from Perforce Change: 179196 ServerID: perforce.ravenbrook.com --- mps/code/fri6gc.gmk | 2 +- mps/code/mps.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/mps/code/fri6gc.gmk b/mps/code/fri6gc.gmk index 081e0cff43b..383197430a2 100644 --- a/mps/code/fri6gc.gmk +++ b/mps/code/fri6gc.gmk @@ -12,7 +12,7 @@ LIBS = -lm -pthread include gc.gmk -CFLAGSCOMPILER := $(subst -pedantic,,$(CFLAGSCOMPILER)) +CFLAGSCOMPILER := $(CFLAGSCOMPILER) -Wno-strict-aliasing CFLAGSDEBUG = -O -g3 CFLAGSOPT = -O3 -g3 diff --git a/mps/code/mps.c b/mps/code/mps.c index cf967507816..0cdb6c8c650 100644 --- a/mps/code/mps.c +++ b/mps/code/mps.c @@ -116,7 +116,7 @@ #elif defined(MPS_PF_FRI3GC) #include "lockix.c" /* Posix locks */ -#include "thix.c" /* FreeBSD on 32-bit Intel threading */ +#include "thix.c" /* Posix threading */ #include "pthrdext.c" /* Posix thread extensions */ #include "vmix.c" /* Posix virtual memory */ #include "protix.c" /* Posix protection */ @@ -126,6 +126,21 @@ #include "span.c" /* generic stack probe */ #include "ssixi3.c" /* Posix on 32-bit Intel stack scan */ +/* FreeBSD on 64-bit Intel built with GCC */ + +#elif defined(MPS_PF_FRI6GC) + +#include "lockix.c" /* Posix locks */ +#include "thix.c" /* Posix threading */ +#include "pthrdext.c" /* Posix thread extensions */ +#include "vmix.c" /* Posix virtual memory */ +#include "protix.c" /* Posix protection */ +#include "protsgix.c" /* Posix signal handling */ +#include "prmcan.c" /* generic mutator context */ +#include "prmci6fr.c" /* 32-bit Intel for FreeBSD mutator context */ +#include "span.c" /* generic stack probe */ +#include "ssixi6.c" /* Posix on 32-bit Intel stack scan */ + /* Linux on 32-bit Intel with GCC */ #elif defined(MPS_PF_LII3GC)