Removing obsolete swpf definitions from makefiles.

Increasing default optimisation levels for GCC.

Copied from Perforce
 Change: 179179
 ServerID: perforce.ravenbrook.com

6 files changed, 12 insertions, 9 deletions

diff --git a/mps/code/fri3gc.gmk b/mps/code/fri3gc.gmk
index 17ce26833a0..2a79160c1e0 100644
--- a/mps/code/fri3gc.gmk
+++ b/mps/code/fri3gc.gmk
@@ -5,11 +5,13 @@
 
 PFM = fri3gc
 
+# FIXME: What is this for?  Clues at
+# http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html
+# Discover whether it's still necessary and if so, document why.
 PFMDEFS = -D_REENTRANT
 
 MPMPF = lockix.c thix.c pthrdext.c vmix.c \
         protix.c protsgix.c prmcan.c prmci3fr.c ssixi3.c span.c
-SWPF = than.c vmfr.c protsw.c prmcan.c ssan.c
 
 LIBS = -lm -pthread
 
diff --git a/mps/code/fri6gc.gmk b/mps/code/fri6gc.gmk
index 44358be0767..de1102190e6 100644
--- a/mps/code/fri6gc.gmk
+++ b/mps/code/fri6gc.gmk
@@ -5,19 +5,21 @@
 
 PFM = fri6gc
 
+# FIXME: What is this for?  Clues at
+# http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html
+# Discover whether it's still necessary and if so, document why.
 PFMDEFS = -D_REENTRANT
 
 MPMPF = lockix.c thix.c pthrdext.c vmix.c \
         protix.c protsgix.c prmcan.c prmci6fr.c ssixi6.c span.c
-SWPF = than.c vmfr.c protsw.c prmcan.c ssan.c
 
 LIBS = -lm -pthread
 
 include gc.gmk
 
 CFLAGSCOMPILER := $(subst -pedantic,,$(CFLAGSCOMPILER))
-CFLAGSDEBUG = -g3
-CFLAGSOPT = -O -g3
+CFLAGSDEBUG = -O -g3
+CFLAGSOPT = -O3 -g3
 
 CC = cc
 
diff --git a/mps/code/gc.gmk b/mps/code/gc.gmk
index 2aeb61cdbc1..9b0a087afee 100644
--- a/mps/code/gc.gmk
+++ b/mps/code/gc.gmk
@@ -13,8 +13,8 @@ CFLAGSCOMPILER := \
         -Wstrict-prototypes -Wmissing-prototypes \
         -Winline -Waggregate-return -Wnested-externs \
         -Wcast-qual -Wshadow
-CFLAGSDEBUG = -O0 -g
-CFLAGSOPT = -O3 -g
+CFLAGSDEBUG = -O -g3
+CFLAGSOPT = -O3 -g3
 
 # gcc -MM generates a dependency line of the form:
 #   thing.o : thing.c ...
diff --git a/mps/code/lii3gc.gmk b/mps/code/lii3gc.gmk
index 3652016cc45..148df6fed04 100644
--- a/mps/code/lii3gc.gmk
+++ b/mps/code/lii3gc.gmk
@@ -10,11 +10,11 @@ THREADLIB = -lpthread
 
 # _XOPEN_SOURCE is to get the modern POSIX signal handling
 # _GNU_SOURCE is to get register numbers in prmci3li.c
+# http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html
 PFMDEFS = -D_REENTRANT -D_XOPEN_SOURCE=500 -D_GNU_SOURCE
 
 MPMPF = ${THREADSRC} vmix.c \
         protix.c protli.c proti3.c prmci3li.c ssixi3.c span.c
-SWPF = than.c vmli.c protsw.c prmcan.c ssan.c
 
 LIBS = -lm ${THREADLIB}
 
diff --git a/mps/code/lii6gc.gmk b/mps/code/lii6gc.gmk
index 47d1bb744e0..9c47b0926fb 100644
--- a/mps/code/lii6gc.gmk
+++ b/mps/code/lii6gc.gmk
@@ -10,11 +10,11 @@ THREADLIB = -lpthread
 
 # _XOPEN_SOURCE is to get the modern POSIX signal handling
 # _GNU_SOURCE is to get register numbers in prmci3li.c
+# http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html
 PFMDEFS = -D_REENTRANT -D_XOPEN_SOURCE=500 -D_GNU_SOURCE
 
 MPMPF = ${THREADSRC} vmix.c \
         protix.c protli.c proti6.c prmci6li.c ssixi6.c span.c
-SWPF = than.c vmli.c protsw.c prmcan.c ssan.c
 
 LIBS = -lm ${THREADLIB}
 
diff --git a/mps/code/xci3gc.gmk b/mps/code/xci3gc.gmk
index a8bed82a7f1..1aea3bc22d5 100644
--- a/mps/code/xci3gc.gmk
+++ b/mps/code/xci3gc.gmk
@@ -9,7 +9,6 @@ PFM = xci3gc
 
 MPMPF = lockix.c than.c vmix.c \
         protix.c protsgix.c prmcan.c span.c ssixi3.c
-SWPF = than.c vmxc.c protsw.c prmcan.c ssan.c
 
 LIBS =