From 78f47dacd60d0e2abcc61e301dd14dba34cd3400 Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 15 Dec 2014 22:39:21 +0000 Subject: [PATCH] Move gcc-specific options to the appropriate wmake rules files --- applications/solvers/multiphase/driftFluxFoam/Make/options | 2 +- .../utilities/mesh/generation/foamyHexMesh/Make/options | 1 - .../foamyHexMesh/cellSizeAndAlignmentGrid/Make/options | 1 - .../foamyHexMesh/conformalVoronoiMesh/Make/options | 1 - .../backgroundMeshDecompositionTemplates.C | 4 ++-- .../conformalVoronoiMesh/conformalVoronoiMesh.C | 2 +- .../foamyHexMesh/foamyHexMeshBackgroundMesh/Make/options | 1 - .../utilities/mesh/generation/foamyQuadMesh/Make/options | 1 - wmake/rules/linux64Gcc/c++Opt | 3 ++- wmake/rules/linux64Gcc45/c++Opt | 4 ++-- wmake/rules/linux64Gcc46/c++Opt | 4 ++-- wmake/rules/linux64Gcc47/c++Opt | 2 ++ wmake/rules/linux64Gcc48/c++Opt | 2 ++ wmake/rules/linux64Gcc49/c++Opt | 2 ++ wmake/rules/linuxARM7Gcc/c++Opt | 2 ++ wmake/rules/linuxGcc/c++Opt | 2 ++ wmake/rules/linuxGcc45/c++Opt | 2 ++ wmake/rules/linuxGcc46/c++Opt | 2 ++ wmake/rules/linuxGcc47/c++Opt | 2 ++ wmake/rules/linuxGcc48/c++Opt | 2 ++ wmake/rules/linuxGcc49/c++Opt | 2 ++ wmake/rules/linuxPPC64Gcc/c++Opt | 2 ++ wmake/rules/solaris64Gcc/c++Opt | 2 ++ wmake/rules/solarisGcc/c++Opt | 6 ++++-- 24 files changed, 38 insertions(+), 16 deletions(-) diff --git a/applications/solvers/multiphase/driftFluxFoam/Make/options b/applications/solvers/multiphase/driftFluxFoam/Make/options index af00448417..c66f9de53b 100644 --- a/applications/solvers/multiphase/driftFluxFoam/Make/options +++ b/applications/solvers/multiphase/driftFluxFoam/Make/options @@ -22,4 +22,4 @@ EXE_LIBS = \ -lfvOptions \ -lincompressibleTransportModels \ -lturbulenceModels \ - -lcompressibleTurbulenceModels \ No newline at end of file + -lcompressibleTurbulenceModels diff --git a/applications/utilities/mesh/generation/foamyHexMesh/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/Make/options index b13ba99ab1..de69e9d49c 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyHexMesh/Make/options @@ -1,5 +1,4 @@ EXE_DEBUG = -DFULLDEBUG -g -O0 -EXE_FROUNDING_MATH = -frounding-math EXE_NDEBUG = -DNDEBUG CGAL_EXACT = /*-DCGAL_DONT_USE_LAZY_KERNEL*/ diff --git a/applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/Make/options index b7df05f045..8fdd0d8ba9 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/Make/options +++ b/applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/Make/options @@ -1,5 +1,4 @@ EXE_DEBUG = -DFULLDEBUG -g -O0 -EXE_FROUNDING_MATH = -frounding-math EXE_NDEBUG = -DNDEBUG CGAL_EXACT = /*-DCGAL_DONT_USE_LAZY_KERNEL*/ diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options index cd23364bc2..5f511f4b63 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options @@ -1,5 +1,4 @@ EXE_DEBUG = -DFULLDEBUG -g -O0 -EXE_FROUNDING_MATH = -frounding-math EXE_NDEBUG = -DNDEBUG CGAL_EXACT = /*-DCGAL_DONT_USE_LAZY_KERNEL*/ diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C index 148de2bafa..e49e35f595 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C @@ -60,7 +60,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorPosition forAll(pts, pI) { - const pointFromPoint pt = topoint(pts[pI]); + pointFromPoint pt = topoint(pts[pI]); label nCandidates = 0; @@ -130,7 +130,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorPosition if (ptProc[pI] < 0) { - const pointFromPoint pt = topoint(pts[pI]); + pointFromPoint pt = topoint(pts[pI]); if (!globalBackgroundBounds_.contains(pt)) { diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C index 6bfb7f3067..599a772c06 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C @@ -607,7 +607,7 @@ void Foam::conformalVoronoiMesh::setVertexSizeAndAlignment() { if (vit->internalOrBoundaryPoint()) { - const pointFromPoint pt = topoint(vit->point()); + pointFromPoint pt = topoint(vit->point()); cellShapeControls().cellSizeAndAlignment ( diff --git a/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshBackgroundMesh/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshBackgroundMesh/Make/options index c81108dbca..c532c8f0a5 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshBackgroundMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshBackgroundMesh/Make/options @@ -1,5 +1,4 @@ EXE_DEBUG = -DFULLDEBUG -g -O0 -EXE_FROUNDING_MATH = -frounding-math EXE_NDEBUG = -DNDEBUG include $(GENERAL_RULES)/CGAL diff --git a/applications/utilities/mesh/generation/foamyQuadMesh/Make/options b/applications/utilities/mesh/generation/foamyQuadMesh/Make/options index 75823532ef..8b95e5d97e 100644 --- a/applications/utilities/mesh/generation/foamyQuadMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyQuadMesh/Make/options @@ -1,5 +1,4 @@ EXE_DEBUG = -DFULLDEBUG -g -O0 -EXE_FROUNDING_MATH = -frounding-math EXE_NDEBUG = -DNDEBUG include $(GENERAL_RULES)/CGAL diff --git a/wmake/rules/linux64Gcc/c++Opt b/wmake/rules/linux64Gcc/c++Opt index a0fae531b8..3d451820fd 100644 --- a/wmake/rules/linux64Gcc/c++Opt +++ b/wmake/rules/linux64Gcc/c++Opt @@ -1,3 +1,4 @@ c++DBUG = c++OPT = -O3 -# -fprefetch-loop-arrays + +EXE_FROUNDING_MATH = -frounding-math diff --git a/wmake/rules/linux64Gcc45/c++Opt b/wmake/rules/linux64Gcc45/c++Opt index 3446f7f58c..3d451820fd 100644 --- a/wmake/rules/linux64Gcc45/c++Opt +++ b/wmake/rules/linux64Gcc45/c++Opt @@ -1,4 +1,4 @@ c++DBUG = c++OPT = -O3 -#c++OPT = -march=nocona -O3 -# -ftree-vectorize -ftree-vectorizer-verbose=3 + +EXE_FROUNDING_MATH = -frounding-math diff --git a/wmake/rules/linux64Gcc46/c++Opt b/wmake/rules/linux64Gcc46/c++Opt index 3446f7f58c..3d451820fd 100644 --- a/wmake/rules/linux64Gcc46/c++Opt +++ b/wmake/rules/linux64Gcc46/c++Opt @@ -1,4 +1,4 @@ c++DBUG = c++OPT = -O3 -#c++OPT = -march=nocona -O3 -# -ftree-vectorize -ftree-vectorizer-verbose=3 + +EXE_FROUNDING_MATH = -frounding-math diff --git a/wmake/rules/linux64Gcc47/c++Opt b/wmake/rules/linux64Gcc47/c++Opt index 2aedabd628..3d451820fd 100644 --- a/wmake/rules/linux64Gcc47/c++Opt +++ b/wmake/rules/linux64Gcc47/c++Opt @@ -1,2 +1,4 @@ c++DBUG = c++OPT = -O3 + +EXE_FROUNDING_MATH = -frounding-math diff --git a/wmake/rules/linux64Gcc48/c++Opt b/wmake/rules/linux64Gcc48/c++Opt index 2aedabd628..3d451820fd 100644 --- a/wmake/rules/linux64Gcc48/c++Opt +++ b/wmake/rules/linux64Gcc48/c++Opt @@ -1,2 +1,4 @@ c++DBUG = c++OPT = -O3 + +EXE_FROUNDING_MATH = -frounding-math diff --git a/wmake/rules/linux64Gcc49/c++Opt b/wmake/rules/linux64Gcc49/c++Opt index 2aedabd628..3d451820fd 100644 --- a/wmake/rules/linux64Gcc49/c++Opt +++ b/wmake/rules/linux64Gcc49/c++Opt @@ -1,2 +1,4 @@ c++DBUG = c++OPT = -O3 + +EXE_FROUNDING_MATH = -frounding-math diff --git a/wmake/rules/linuxARM7Gcc/c++Opt b/wmake/rules/linuxARM7Gcc/c++Opt index a9c0f51238..5b5cb75142 100644 --- a/wmake/rules/linuxARM7Gcc/c++Opt +++ b/wmake/rules/linuxARM7Gcc/c++Opt @@ -1,3 +1,5 @@ c++DBUG = #c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=softfp + +EXE_FROUNDING_MATH = -frounding-math diff --git a/wmake/rules/linuxGcc/c++Opt b/wmake/rules/linuxGcc/c++Opt index 2aedabd628..3d451820fd 100644 --- a/wmake/rules/linuxGcc/c++Opt +++ b/wmake/rules/linuxGcc/c++Opt @@ -1,2 +1,4 @@ c++DBUG = c++OPT = -O3 + +EXE_FROUNDING_MATH = -frounding-math diff --git a/wmake/rules/linuxGcc45/c++Opt b/wmake/rules/linuxGcc45/c++Opt index 2aedabd628..3d451820fd 100644 --- a/wmake/rules/linuxGcc45/c++Opt +++ b/wmake/rules/linuxGcc45/c++Opt @@ -1,2 +1,4 @@ c++DBUG = c++OPT = -O3 + +EXE_FROUNDING_MATH = -frounding-math diff --git a/wmake/rules/linuxGcc46/c++Opt b/wmake/rules/linuxGcc46/c++Opt index 2aedabd628..3d451820fd 100644 --- a/wmake/rules/linuxGcc46/c++Opt +++ b/wmake/rules/linuxGcc46/c++Opt @@ -1,2 +1,4 @@ c++DBUG = c++OPT = -O3 + +EXE_FROUNDING_MATH = -frounding-math diff --git a/wmake/rules/linuxGcc47/c++Opt b/wmake/rules/linuxGcc47/c++Opt index 2aedabd628..3d451820fd 100644 --- a/wmake/rules/linuxGcc47/c++Opt +++ b/wmake/rules/linuxGcc47/c++Opt @@ -1,2 +1,4 @@ c++DBUG = c++OPT = -O3 + +EXE_FROUNDING_MATH = -frounding-math diff --git a/wmake/rules/linuxGcc48/c++Opt b/wmake/rules/linuxGcc48/c++Opt index 2aedabd628..3d451820fd 100644 --- a/wmake/rules/linuxGcc48/c++Opt +++ b/wmake/rules/linuxGcc48/c++Opt @@ -1,2 +1,4 @@ c++DBUG = c++OPT = -O3 + +EXE_FROUNDING_MATH = -frounding-math diff --git a/wmake/rules/linuxGcc49/c++Opt b/wmake/rules/linuxGcc49/c++Opt index 2aedabd628..3d451820fd 100644 --- a/wmake/rules/linuxGcc49/c++Opt +++ b/wmake/rules/linuxGcc49/c++Opt @@ -1,2 +1,4 @@ c++DBUG = c++OPT = -O3 + +EXE_FROUNDING_MATH = -frounding-math diff --git a/wmake/rules/linuxPPC64Gcc/c++Opt b/wmake/rules/linuxPPC64Gcc/c++Opt index 2aedabd628..3d451820fd 100644 --- a/wmake/rules/linuxPPC64Gcc/c++Opt +++ b/wmake/rules/linuxPPC64Gcc/c++Opt @@ -1,2 +1,4 @@ c++DBUG = c++OPT = -O3 + +EXE_FROUNDING_MATH = -frounding-math diff --git a/wmake/rules/solaris64Gcc/c++Opt b/wmake/rules/solaris64Gcc/c++Opt index 2aedabd628..3d451820fd 100644 --- a/wmake/rules/solaris64Gcc/c++Opt +++ b/wmake/rules/solaris64Gcc/c++Opt @@ -1,2 +1,4 @@ c++DBUG = c++OPT = -O3 + +EXE_FROUNDING_MATH = -frounding-math diff --git a/wmake/rules/solarisGcc/c++Opt b/wmake/rules/solarisGcc/c++Opt index 18428f1826..b146ab642b 100644 --- a/wmake/rules/solarisGcc/c++Opt +++ b/wmake/rules/solarisGcc/c++Opt @@ -1,2 +1,4 @@ -c++DBUG = -c++OPT = -O3 -fno-schedule-insns +c++DBUG = +c++OPT = -O3 -fno-schedule-insns + +EXE_FROUNDING_MATH = -frounding-math